diff --git a/react/features/base/modal/components/JitsiKeyboardAvoidingView.js b/react/features/base/modal/components/JitsiKeyboardAvoidingView.js index 0f3fae9cd..483c0ea75 100644 --- a/react/features/base/modal/components/JitsiKeyboardAvoidingView.js +++ b/react/features/base/modal/components/JitsiKeyboardAvoidingView.js @@ -34,6 +34,11 @@ type Props = { */ hasTabNavigator: boolean, + /** + * Is the keyboard already dismissible? + */ + keyboardAlreadyDismissible?: boolean, + /** * Additional style to be appended to the KeyboardAvoidingView. */ @@ -46,6 +51,7 @@ const JitsiKeyboardAvoidingView = ( contentContainerStyle, hasTabNavigator, hasBottomTextInput, + keyboardAlreadyDismissible, style }: Props) => { const headerHeight = useHeaderHeight(); @@ -68,7 +74,7 @@ const JitsiKeyboardAvoidingView = ( ? headerHeight + StatusBar.currentHeight : headerHeight; // Tells the view what to do with taps - const shouldSetResponse = useCallback(() => true); + const shouldSetResponse = useCallback(() => !keyboardAlreadyDismissible); const onRelease = useCallback(() => Keyboard.dismiss()); return ( diff --git a/react/features/base/modal/components/JitsiScreen.js b/react/features/base/modal/components/JitsiScreen.js index db44e6d7a..d273bb872 100644 --- a/react/features/base/modal/components/JitsiScreen.js +++ b/react/features/base/modal/components/JitsiScreen.js @@ -37,6 +37,11 @@ type Props = { */ hasTabNavigator?: boolean, + /** + * Is the keyboard already dismissible? + */ + keyboardAlreadyDismissible?: boolean, + /** * Insets for the SafeAreaView. */ @@ -54,6 +59,7 @@ const JitsiScreen = ({ footerComponent, hasTabNavigator = false, hasBottomTextInput = false, + keyboardAlreadyDismissible = false, safeAreaInsets = [ 'left', 'right' ], style }: Props) => ( @@ -63,13 +69,14 @@ const JitsiScreen = ({ contentContainerStyle = { contentContainerStyle } hasBottomTextInput = { hasBottomTextInput } hasTabNavigator = { hasTabNavigator } + keyboardAlreadyDismissible = { keyboardAlreadyDismissible } style = { style }> {children} - {footerComponent && footerComponent()} + { footerComponent && footerComponent() } ); diff --git a/react/features/chat/components/native/Chat.js b/react/features/chat/components/native/Chat.js index c3b2affd1..563260328 100644 --- a/react/features/chat/components/native/Chat.js +++ b/react/features/chat/components/native/Chat.js @@ -55,6 +55,7 @@ class Chat extends AbstractChat {