Skip to content

[FIX] Text composer is pushing modals outside the screen on Android's tablet #4393

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
reinaldonetof merged 7 commits into from
Aug 11, 2022
Merged

[FIX] Text composer is pushing modals outside the screen on Android's tablet #4393

Changes from 5 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
743d19d
[FIX] Text composer is pushing modals outside the screen
reinaldonetof Jul 27, 2022
d4b2c2b
added isLandscape
reinaldonetof Jul 27, 2022
a6f6a93
Merge branch 'develop' into fix.modal-tablet
reinaldonetof Jul 29, 2022
ea1dd75
refactor useKeyboard
reinaldonetof Jul 29, 2022
e971c57
refactor landscape
reinaldonetof Jul 29, 2022
14dbb74
Merge branch 'develop' into fix.modal-tablet
reinaldonetof Aug 11, 2022
72f8a54
Merge branch 'develop' into fix.modal-tablet
reinaldonetof Aug 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 17 additions & 1 deletion app/stacks/MasterDetailStack/ModalContainer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,14 @@ import React from 'react';
import { StyleSheet, TouchableWithoutFeedback, useWindowDimensions, View } from 'react-native';
import { StackNavigationProp } from '@react-navigation/stack';
import { NavigationContainerProps } from '@react-navigation/core';
import { useKeyboard } from '@react-native-community/hooks';

import sharedStyles from '../../views/Styles';
import { themes } from '../../lib/constants';
import { TSupportedThemes } from '../../theme';
import { isAndroid } from '../../lib/methods/helpers';

const MODAL_MARGIN = 32;

interface IModalContainer extends NavigationContainerProps {
navigation: StackNavigationProp<any>;
Expand All @@ -25,8 +29,20 @@ const styles = StyleSheet.create({
});

export const ModalContainer = ({ navigation, children, theme }: IModalContainer): JSX.Element => {
const { keyboardHeight, keyboardShown } = useKeyboard();
const { height } = useWindowDimensions();
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 (
<View style={[styles.root, { backgroundColor: `${themes[theme].backdropColor}70` }]}>
<TouchableWithoutFeedback onPress={() => navigation.pop()}>
Expand All @@ -35,7 +51,7 @@ export const ModalContainer = ({ navigation, children, theme }: IModalContainer)
<View
style={{
...sharedStyles.modalFormSheet,
height: modalHeight > height ? height : modalHeight
height: heightModal
}}>
{children}
</View>
Expand Down