Skip to content

fix: Android KeyboardAvoidingView issue in edgeToEdgeEnabled in new architecture #130

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
azeezat merged 1 commit into from
Oct 25, 2025
Merged

fix: Android KeyboardAvoidingView issue in edgeToEdgeEnabled in new architecture #130

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
30 changes: 8 additions & 22 deletions src/components/CustomModal/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* eslint-disable react-native/no-inline-styles */
import React, { PropsWithChildren, ReactElement } from 'react';
import React from 'react';
import {
KeyboardAvoidingView,
Modal,
Expand All @@ -14,18 +14,6 @@ import { colors } from '../../styles/colors';
import { TCustomModalControls } from 'src/types/index.types';
import { useSafeAreaInsets } from 'react-native-safe-area-context';

// In iOS, `SafeAreaView` does not automatically account on keyboard.
// Therefore, for iOS we need to wrap the content in `KeyboardAvoidingView`.
const ModalContentWrapper = ({ children }: PropsWithChildren): ReactElement => {
return Platform.OS === 'ios' ? (
<KeyboardAvoidingView style={[{ flex: 1 }]} behavior="padding">
{children}
</KeyboardAvoidingView>
) : (
<>{children}</>
);
};

const CustomModal = ({
visible,
modalControls,
Expand All @@ -44,15 +32,13 @@ const CustomModal = ({
animationType="fade"
{...modalControls?.modalProps}
>
{/*Used to fix the select with search box behavior in iOS*/}
<ModalContentWrapper>
<KeyboardAvoidingView
style={{ flex: 1 }}
behavior={Platform.OS === 'ios' ? 'padding' : 'height'}
>
<TouchableOpacity
onPress={onRequestClose}
style={[
styles.modalContainer,
styles.modalBackgroundStyle,
modalControls?.modalBackgroundStyle,
]}
style={[styles.modalContainer, modalControls?.modalBackgroundStyle]}
aria-label="close modal"
>
{/* Added this `TouchableWithoutFeedback` wrapper because of the closing modal on expo web */}
Expand All @@ -69,7 +55,7 @@ const CustomModal = ({
</View>
</TouchableWithoutFeedback>
</TouchableOpacity>
</ModalContentWrapper>
</KeyboardAvoidingView>
</Modal>
);
};
Expand All @@ -78,8 +64,8 @@ const styles = StyleSheet.create({
modalContainer: {
flex: 1,
justifyContent: 'flex-end',
backgroundColor: 'rgba(0, 0, 0, 0.5)',
},
modalBackgroundStyle: { backgroundColor: 'rgba(0, 0, 0, 0.5)' },
modalOptionsContainer: {
maxHeight: '50%',
backgroundColor: colors.white,
Expand Down
Loading