Merge pull request #30557 from tienifr/fix/30268

fix: 30268 The keyboard closes after a moment when tapping back button
Expensify · Nov 6, 2023 · fa89ada · fa89ada
2 parents 12ff3ea + ed42039
commit fa89ada
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/src/components/ScreenWrapper/index.js b/src/components/ScreenWrapper/index.js
@@ -49,6 +49,10 @@ function ScreenWrapper({
     const minHeight = shouldEnableMinHeight ? initialHeight : undefined;
     const isKeyboardShown = lodashGet(keyboardState, 'isKeyboardShown', false);
 
+    const isKeyboardShownRef = useRef();
+
+    isKeyboardShownRef.current = lodashGet(keyboardState, 'isKeyboardShown', false);
+
     const panResponder = useRef(
         PanResponder.create({
             onStartShouldSetPanResponderCapture: (e, gestureState) => gestureState.numberActiveTouches === CONST.TEST_TOOL.NUMBER_OF_TAPS,
@@ -84,7 +88,7 @@ function ScreenWrapper({
         // described here https://reactnavigation.org/docs/preventing-going-back/#limitations
         const beforeRemoveSubscription = shouldDismissKeyboardBeforeClose
             ? navigation.addListener('beforeRemove', () => {
-                  if (!isKeyboardShown) {
+                  if (!isKeyboardShownRef.current) {
                       return;
                   }
                   Keyboard.dismiss();