[RNMobile] Fix padding bottom in bottom-sheet for phones that don't n…

…eed the safe area (#26722)
WordPress · Nov 5, 2020 · 5f6514c · 5f6514c
1 parent 8582893
commit 5f6514c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/packages/block-editor/src/components/inserter/menu.native.js b/packages/block-editor/src/components/inserter/menu.native.js
@@ -137,10 +137,7 @@ export class InserterMenu extends Component {
 			>
 				<TouchableHighlight accessible={ false }>
 					<BottomSheetConsumer>
-						{ ( {
-							listProps,
-							safeAreaBottomInset = styles.list.paddingBottom,
-						} ) => (
+						{ ( { listProps, safeAreaBottomInset } ) => (
 							<FlatList
 								onLayout={ this.onLayout }
 								key={ `InserterUI-${ numberOfColumns }` } //re-render when numberOfColumns changes
@@ -160,7 +157,9 @@ export class InserterMenu extends Component {
 								contentContainerStyle={ [
 									...listProps.contentContainerStyle,
 									{
-										paddingBottom: safeAreaBottomInset,
+										paddingBottom:
+											safeAreaBottomInset ||
+											styles.list.paddingBottom,
 									},
 								] }
 							/>

diff --git a/...es/components/src/mobile/bottom-sheet/bottom-sheet-navigation/navigation-screen.native.js b/...es/components/src/mobile/bottom-sheet/bottom-sheet-navigation/navigation-screen.native.js
@@ -36,7 +36,7 @@ const BottomSheetNavigationScreen = ( {
 		shouldEnableBottomSheetMaxHeight,
 		setIsFullScreen,
 		listProps,
-		safeAreaBottomInset = styles.scrollableContent.paddingBottom,
+		safeAreaBottomInset,
 	} = useContext( BottomSheetContext );
 
 	const { setHeight } = useContext( BottomSheetNavigationContext );
@@ -88,7 +88,9 @@ const BottomSheetNavigationScreen = ( {
 						{ ! isNested && (
 							<View
 								style={ {
-									height: safeAreaBottomInset,
+									height:
+										safeAreaBottomInset ||
+										styles.scrollableContent.paddingBottom,
 								} }
 							/>
 						) }