From 887721792e8c7908c0953b93db376e9e6cc4481c Mon Sep 17 00:00:00 2001 From: Qichen Zhu <57348009+QichenZhu@users.noreply.github.com> Date: Thu, 10 Oct 2024 23:20:51 +1300 Subject: [PATCH 1/2] Fix KeyboardAvoidingView not aware of the keyboard closing after it is unmounted --- .../Libraries/Components/Keyboard/KeyboardAvoidingView.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/packages/react-native/Libraries/Components/Keyboard/KeyboardAvoidingView.js b/packages/react-native/Libraries/Components/Keyboard/KeyboardAvoidingView.js index 860118dc38375e..9536d74c69af6b 100644 --- a/packages/react-native/Libraries/Components/Keyboard/KeyboardAvoidingView.js +++ b/packages/react-native/Libraries/Components/Keyboard/KeyboardAvoidingView.js @@ -191,6 +191,10 @@ class KeyboardAvoidingView extends React.Component { } componentDidMount(): void { + if (!Keyboard.isVisible()) { + this._setBottom(0); + } + if (Platform.OS === 'ios') { this._subscriptions = [ Keyboard.addListener('keyboardWillChangeFrame', this._onKeyboardChange), From 8b008adc8a58c12a243de40b99ee7d563c399c3e Mon Sep 17 00:00:00 2001 From: Qichen Zhu <57348009+QichenZhu@users.noreply.github.com> Date: Fri, 11 Oct 2024 01:05:01 +1300 Subject: [PATCH 2/2] Clear keyboardEvent if the keyboard was closed before remounting --- .../Libraries/Components/Keyboard/KeyboardAvoidingView.js | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/react-native/Libraries/Components/Keyboard/KeyboardAvoidingView.js b/packages/react-native/Libraries/Components/Keyboard/KeyboardAvoidingView.js index 9536d74c69af6b..3a3f101c8d9b2e 100644 --- a/packages/react-native/Libraries/Components/Keyboard/KeyboardAvoidingView.js +++ b/packages/react-native/Libraries/Components/Keyboard/KeyboardAvoidingView.js @@ -192,6 +192,7 @@ class KeyboardAvoidingView extends React.Component { componentDidMount(): void { if (!Keyboard.isVisible()) { + this._keyboardEvent = null; this._setBottom(0); }