diff --git a/react/features/base/dialog/components/native/BottomSheet.js b/react/features/base/dialog/components/native/BottomSheet.js index 4f7944b66..5a90ab3a7 100644 --- a/react/features/base/dialog/components/native/BottomSheet.js +++ b/react/features/base/dialog/components/native/BottomSheet.js @@ -1,7 +1,9 @@ // @flow import React, { Component, type Node } from 'react'; -import { Modal, TouchableWithoutFeedback, View } from 'react-native'; +import { TouchableWithoutFeedback, View } from 'react-native'; + +import { Modal } from '../../../react'; import { bottomSheetStyles as styles } from './styles'; @@ -50,14 +52,8 @@ export default class BottomSheet extends Component { key = 'overlay' style = { styles.overlay } />, { + + /** + * Implements {@code Component#render}. + * + * @inheritdoc + */ + render() { + const { children, ...props } = this.props; + + return ( + + { children } + + ); + } +} diff --git a/react/features/base/react/components/native/index.js b/react/features/base/react/components/native/index.js index ada6339c5..1cfc6fbe3 100644 --- a/react/features/base/react/components/native/index.js +++ b/react/features/base/react/components/native/index.js @@ -4,6 +4,7 @@ export { default as Header } from './Header'; export { default as HeaderLabel } from './HeaderLabel'; export { default as Link } from './Link'; export { default as LoadingIndicator } from './LoadingIndicator'; +export { default as Modal } from './Modal'; export { default as NavigateSectionListEmptyComponent } from './NavigateSectionListEmptyComponent'; export { default as NavigateSectionListItem } diff --git a/react/features/settings/components/native/SettingsView.js b/react/features/settings/components/native/SettingsView.js index 5cdd4c1e0..2cf45dfb4 100644 --- a/react/features/settings/components/native/SettingsView.js +++ b/react/features/settings/components/native/SettingsView.js @@ -3,7 +3,6 @@ import React from 'react'; import { Alert, - Modal, SafeAreaView, ScrollView, Switch, @@ -13,7 +12,7 @@ import { import { connect } from 'react-redux'; import { translate } from '../../../base/i18n'; -import { BackButton, Header } from '../../../base/react'; +import { BackButton, Header, Modal } from '../../../base/react'; import { AbstractSettingsView, @@ -58,13 +57,8 @@ class SettingsView extends AbstractSettingsView { render() { return ( { this._renderHeader() } diff --git a/react/features/settings/components/native/styles.js b/react/features/settings/components/native/styles.js index d202d3cb8..2cf94d0d1 100644 --- a/react/features/settings/components/native/styles.js +++ b/react/features/settings/components/native/styles.js @@ -64,6 +64,11 @@ export default createStyleSheet({ padding: 5 }, + settingsForm: { + backgroundColor: ColorPalette.white, + flex: 1 + }, + /** * Global {@code Text} color for the components. */