Skip to content

Fix Android edge-to-edge display issue in modal #9

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
merged 2 commits into from
Oct 7, 2025
Merged

Fix Android edge-to-edge display issue in modal #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
da8ce9f
Fix Android edge-to-edge display issue in modal
sh1zzle Sep 26, 2025
837b4eb
remove unused variable
imdevan Oct 7, 2025
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
7 changes: 4 additions & 3 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,9 @@
"typescript": "^5.2.2"
},
"peerDependencies": {
"react": "*",
"react-native": "*",
"react-native-gesture-handler": "*"
"react": "^18.2.0",
"react-native": "^0.72.5",
"react-native-safe-area-context": "^4.0.0",
"react-native-gesture-handler": "^2.18.0"
}
}
30 changes: 24 additions & 6 deletions src/components/Picker.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,9 @@ import {
} from 'react-native';

import { FlatList, ScrollView } from 'react-native-gesture-handler';

// Import SafeAreaView from react-native-safe-area-context for better edge-to-edge support
import { SafeAreaView as SafeAreaContextView } from 'react-native-safe-area-context';
import {
ASCII_CODE,
BADGE_COLORS,
Expand Down Expand Up @@ -904,7 +907,15 @@ function Picker({
* @returns {object}
*/
const _modalContentContainerStyle = useMemo(
() => [THEME.modalContentContainer, ...[modalContentContainerStyle].flat()],
() => [
THEME.modalContentContainer,
// Add edge-to-edge support for Android
Platform.OS === 'android' && {
flex: 1,
backgroundColor: THEME.modalContentContainer.backgroundColor || '#FFFFFF',
},
...[modalContentContainerStyle].flat()
],
[modalContentContainerStyle, THEME],
);

Expand Down Expand Up @@ -1936,13 +1947,20 @@ function Picker({
presentationStyle='fullScreen'
onRequestClose={onRequestCloseModal}
{...modalProps}>
<SafeAreaView style={_modalContentContainerStyle}>
{SearchComponent}
{DropDownFlatListComponent}
</SafeAreaView>
{Platform.OS === 'android' ? (
<SafeAreaContextView style={_modalContentContainerStyle} edges={['top', 'bottom', 'left', 'right']}>
{SearchComponent}
{DropDownFlatListComponent}
</SafeAreaContextView>
) : (
<SafeAreaView style={_modalContentContainerStyle}>
{SearchComponent}
{DropDownFlatListComponent}
</SafeAreaView>
)}
</Modal>
),
[open, SearchComponent, _modalContentContainerStyle, modalProps],
[open, SearchComponent, DropDownFlatListComponent, _modalContentContainerStyle, modalProps],
);

/**
Expand Down
Loading