diff --git a/packages/rn-tester/js/RNTesterAppShared.js b/packages/rn-tester/js/RNTesterAppShared.js
index 1956e27c46a9..afbaa33a616c 100644
--- a/packages/rn-tester/js/RNTesterAppShared.js
+++ b/packages/rn-tester/js/RNTesterAppShared.js
@@ -273,6 +273,7 @@ const RNTesterApp = ({
return null;
}
+ const isIOS = Platform.OS === 'ios';
const activeModule =
// $FlowFixMe[invalid-computed-prop]
activeModuleKey != null ? RNTesterList.Modules[activeModuleKey] : null;
@@ -289,7 +290,7 @@ const RNTesterApp = ({
const BackButtonComponent: ?BackButton = customBackButton
? customBackButton
- : Platform.OS === 'ios'
+ : isIOS
? ({onBack}) => (
)
@@ -322,17 +323,19 @@ const RNTesterApp = ({
module={activeModule}
example={activeModuleExample}
onExampleCardPress={handleModuleExampleCardPress}
+ bottomInset={isIOS ? contentInsets.bottom : undefined}
/>
) : (
)}
);
- if (Platform.OS === 'ios') {
+ if (isIOS) {
return (
- {Platform.OS === 'android' ? : null}
+
{titleBar}
{content}
{!shouldHideChrome && (
diff --git a/packages/rn-tester/js/components/RNTesterExampleFilter.js b/packages/rn-tester/js/components/RNTesterExampleFilter.js
index d4d7d4508969..012df785839b 100644
--- a/packages/rn-tester/js/components/RNTesterExampleFilter.js
+++ b/packages/rn-tester/js/components/RNTesterExampleFilter.js
@@ -30,6 +30,7 @@ type Props = {
disableSearch?: boolean,
testID?: string,
hideFilterPills?: boolean,
+ bottomInset?: number,
page: 'examples_page' | 'components_page',
sections: ReadonlyArray>,
...
@@ -91,6 +92,14 @@ class RNTesterExampleFilter extends React.Component, State> {
if (this.props.page === 'examples_page') {
return (
{this.props.render({filteredSections})}
diff --git a/packages/rn-tester/js/components/RNTesterModuleContainer.js b/packages/rn-tester/js/components/RNTesterModuleContainer.js
index b979f6bbf21d..2da9d4533097 100644
--- a/packages/rn-tester/js/components/RNTesterModuleContainer.js
+++ b/packages/rn-tester/js/components/RNTesterModuleContainer.js
@@ -27,6 +27,7 @@ type Props = {
module: RNTesterModule,
example?: ?RNTesterModuleExample,
onExampleCardPress?: ?(exampleName: string) => unknown,
+ bottomInset?: number,
};
function getExampleTitle(title: $FlowFixMe, platform: $FlowFixMe) {
@@ -34,7 +35,7 @@ function getExampleTitle(title: $FlowFixMe, platform: $FlowFixMe) {
}
export default function RNTesterModuleContainer(props: Props): React.Node {
- const {module, example, onExampleCardPress} = props;
+ const {module, example, onExampleCardPress, bottomInset} = props;
const theme = useContext(RNTesterThemeContext);
const renderExample = (e: $FlowFixMe, i: $FlowFixMe) => {
// Filter platform-specific es
@@ -82,11 +83,24 @@ export default function RNTesterModuleContainer(props: Props): React.Node {
return singleModule != null ? (
<>
{singleModule.scrollable === true ? (
-
+
) : (
-
+
)}
@@ -99,6 +113,7 @@ export default function RNTesterModuleContainer(props: Props): React.Node {
testID="example_search"
page="examples_page"
hideFilterPills={true}
+ bottomInset={bottomInset}
sections={sections}
filter={filter}
render={({filteredSections}) =>
diff --git a/packages/rn-tester/js/components/RNTesterModuleList.js b/packages/rn-tester/js/components/RNTesterModuleList.js
index 089799b446ce..d6aa6819be80 100644
--- a/packages/rn-tester/js/components/RNTesterModuleList.js
+++ b/packages/rn-tester/js/components/RNTesterModuleList.js
@@ -64,7 +64,7 @@ const renderSectionHeader = ({section}: {section: any, ...}) => (
);
const RNTesterModuleList: React.ComponentType = memo(
- ({sections, handleModuleCardPress}: any) => {
+ ({sections, handleModuleCardPress, bottomInset = 0}: any) => {
const filter = ({example, filterRegex, category}: any) =>
filterRegex.test(example.module.title) &&
(!category || example.category === category);
@@ -102,7 +102,9 @@ const RNTesterModuleList: React.ComponentType = memo(
keyboardDismissMode="on-drag"
renderSectionHeader={renderSectionHeader}
// eslint-disable-next-line react/no-unstable-nested-components
- ListFooterComponent={() => }
+ ListFooterComponent={() => (
+
+ )}
/>
)}
/>