[FIX] Text composer is pushing modals outside the screen on Android's tablet (#4393)
* [FIX] Text composer is pushing modals outside the screen * added isLandscape * refactor useKeyboard * refactor landscape
This commit is contained in:
parent
999e8ab660
commit
0c8177e025
|
@ -2,10 +2,14 @@ import React from 'react';
|
||||||
import { StyleSheet, TouchableWithoutFeedback, useWindowDimensions, View } from 'react-native';
|
import { StyleSheet, TouchableWithoutFeedback, useWindowDimensions, View } from 'react-native';
|
||||||
import { StackNavigationProp } from '@react-navigation/stack';
|
import { StackNavigationProp } from '@react-navigation/stack';
|
||||||
import { NavigationContainerProps } from '@react-navigation/core';
|
import { NavigationContainerProps } from '@react-navigation/core';
|
||||||
|
import { useKeyboard } from '@react-native-community/hooks';
|
||||||
|
|
||||||
import sharedStyles from '../../views/Styles';
|
import sharedStyles from '../../views/Styles';
|
||||||
import { themes } from '../../lib/constants';
|
import { themes } from '../../lib/constants';
|
||||||
import { TSupportedThemes } from '../../theme';
|
import { TSupportedThemes } from '../../theme';
|
||||||
|
import { isAndroid } from '../../lib/methods/helpers';
|
||||||
|
|
||||||
|
const MODAL_MARGIN = 32;
|
||||||
|
|
||||||
interface IModalContainer extends NavigationContainerProps {
|
interface IModalContainer extends NavigationContainerProps {
|
||||||
navigation: StackNavigationProp<any>;
|
navigation: StackNavigationProp<any>;
|
||||||
|
@ -25,8 +29,20 @@ const styles = StyleSheet.create({
|
||||||
});
|
});
|
||||||
|
|
||||||
export const ModalContainer = ({ navigation, children, theme }: IModalContainer): JSX.Element => {
|
export const ModalContainer = ({ navigation, children, theme }: IModalContainer): JSX.Element => {
|
||||||
|
const { keyboardHeight, keyboardShown } = useKeyboard();
|
||||||
const { height } = useWindowDimensions();
|
const { height } = useWindowDimensions();
|
||||||
const modalHeight = sharedStyles.modalFormSheet.height;
|
const modalHeight = sharedStyles.modalFormSheet.height;
|
||||||
|
|
||||||
|
let heightModal: number;
|
||||||
|
|
||||||
|
if (isAndroid && keyboardShown && keyboardHeight + modalHeight > height) {
|
||||||
|
heightModal = height - keyboardHeight - MODAL_MARGIN;
|
||||||
|
} else if (modalHeight > height) {
|
||||||
|
heightModal = height - MODAL_MARGIN;
|
||||||
|
} else {
|
||||||
|
heightModal = modalHeight;
|
||||||
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<View style={[styles.root, { backgroundColor: `${themes[theme].backdropColor}70` }]}>
|
<View style={[styles.root, { backgroundColor: `${themes[theme].backdropColor}70` }]}>
|
||||||
<TouchableWithoutFeedback onPress={() => navigation.pop()}>
|
<TouchableWithoutFeedback onPress={() => navigation.pop()}>
|
||||||
|
@ -35,7 +51,7 @@ export const ModalContainer = ({ navigation, children, theme }: IModalContainer)
|
||||||
<View
|
<View
|
||||||
style={{
|
style={{
|
||||||
...sharedStyles.modalFormSheet,
|
...sharedStyles.modalFormSheet,
|
||||||
height: modalHeight > height ? height : modalHeight
|
height: heightModal
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
{children}
|
{children}
|
||||||
|
|
Loading…
Reference in New Issue