From 8f34990436f8cc8c1ec1c545488d77db5845166c Mon Sep 17 00:00:00 2001
From: Mo Gorhom <gorhom@me.com>
Date: Sat, 5 Jun 2021 17:23:44 +0100
Subject: [PATCH] fix: dismiss keyboard when sheet position change on Android

---
 src/components/bottomSheet/BottomSheet.tsx    | 25 ++++++++++++++++++-
 .../BottomSheetContainer.tsx                  |  7 ++++--
 2 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/src/components/bottomSheet/BottomSheet.tsx b/src/components/bottomSheet/BottomSheet.tsx
index 9c83cd763..fb960ce96 100644
--- a/src/components/bottomSheet/BottomSheet.tsx
+++ b/src/components/bottomSheet/BottomSheet.tsx
@@ -5,6 +5,7 @@ import React, {
   useImperativeHandle,
   memo,
 } from 'react';
+import { Keyboard, Platform } from 'react-native';
 import invariant from 'invariant';
 import Animated, {
   useAnimatedReaction,
@@ -472,11 +473,25 @@ const BottomSheetComponent = forwardRef<BottomSheet, BottomSheetProps>(
           isSheetClosing.value = false;
         }
 
+        if (
+          Platform.OS === 'android' &&
+          isInTemporaryPosition.value === false &&
+          keyboardState.value === KEYBOARD_STATE.SHOWN
+        ) {
+          Keyboard.dismiss();
+        }
+
         if (_providedOnChange) {
           _providedOnChange(index);
         }
       },
-      [_providedOnChange, animatedCurrentIndex, isSheetClosing]
+      [
+        animatedCurrentIndex,
+        keyboardState,
+        isInTemporaryPosition,
+        isSheetClosing,
+        _providedOnChange,
+      ]
     );
     const handleOnAnimate = useCallback(
       (toPoint: number) => {
@@ -646,10 +661,12 @@ const BottomSheetComponent = forwardRef<BottomSheet, BottomSheetProps>(
           return;
         }
 
+        isInTemporaryPosition.value = false;
         const newSnapPoint = snapPoints[index];
         runOnUI(animateToPosition)(newSnapPoint, 0, animationConfigs);
       },
       [
+        isInTemporaryPosition,
         isSheetClosing,
         animateToPosition,
         animatedSnapPoints,
@@ -728,6 +745,7 @@ const BottomSheetComponent = forwardRef<BottomSheet, BottomSheetProps>(
         }
 
         isSheetClosing.value = true;
+        isInTemporaryPosition.value = false;
         runOnUI(animateToPosition)(
           animatedContainerHeight.value,
           0,
@@ -736,6 +754,7 @@ const BottomSheetComponent = forwardRef<BottomSheet, BottomSheetProps>(
       },
       [
         isSheetClosing,
+        isInTemporaryPosition,
         animateToPosition,
         animatedContainerHeight,
         animatedPosition,
@@ -761,11 +780,13 @@ const BottomSheetComponent = forwardRef<BottomSheet, BottomSheetProps>(
           return;
         }
 
+        isInTemporaryPosition.value = false;
         const snapPoints = animatedSnapPoints.value;
         const newSnapPoint = snapPoints[snapPoints.length - 1];
         runOnUI(animateToPosition)(newSnapPoint, 0, animationConfigs);
       },
       [
+        isInTemporaryPosition,
         isSheetClosing,
         animateToPosition,
         animatedSnapPoints,
@@ -793,12 +814,14 @@ const BottomSheetComponent = forwardRef<BottomSheet, BottomSheetProps>(
           return;
         }
 
+        isInTemporaryPosition.value = false;
         const snapPoints = animatedSnapPoints.value;
         const newSnapPoint = snapPoints[0];
         runOnUI(animateToPosition)(newSnapPoint, 0, animationConfigs);
       },
       [
         isSheetClosing,
+        isInTemporaryPosition,
         animateToPosition,
         animatedSnapPoints,
         animatedContainerHeight,
diff --git a/src/components/bottomSheetContainer/BottomSheetContainer.tsx b/src/components/bottomSheetContainer/BottomSheetContainer.tsx
index c322184e3..6af8528dc 100644
--- a/src/components/bottomSheetContainer/BottomSheetContainer.tsx
+++ b/src/components/bottomSheetContainer/BottomSheetContainer.tsx
@@ -1,5 +1,5 @@
 import React, { memo, useCallback, useMemo, useRef } from 'react';
-import { LayoutChangeEvent, View } from 'react-native';
+import { LayoutChangeEvent, StatusBar, View } from 'react-native';
 import { WINDOW_HEIGHT } from '../../constants';
 import { print } from '../../utilities';
 import { styles } from './styles';
@@ -44,7 +44,10 @@ function BottomSheetContainerComponent({
             top: pageY,
             left: 0,
             right: 0,
-            bottom: Math.max(0, WINDOW_HEIGHT - (pageY + height)),
+            bottom: Math.max(
+              0,
+              WINDOW_HEIGHT - (pageY + height + (StatusBar.currentHeight ?? 0))
+            ),
           };
         }
       );