feat(mobile/navigation): disabled bottom tab navigator backBehavior (#12320)
* feat(mobile/navigation): disabled backBehavior in bottom tab navigator
This commit is contained in:
parent
ad4707c660
commit
0f7aa5a084
|
@ -68,7 +68,7 @@ const WelcomePageTabs = ({ disabled, onListContainerPress, onSettingsScreenFocus
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<WelcomePage.Navigator
|
<WelcomePage.Navigator
|
||||||
initialRouteName = { screen.welcome.tabs.recent }
|
backBehavior = { 'none' }
|
||||||
screenOptions = {{
|
screenOptions = {{
|
||||||
...tabBarOptions,
|
...tabBarOptions,
|
||||||
headerShown: false
|
headerShown: false
|
||||||
|
|
|
@ -161,11 +161,6 @@ interface Props extends WithTranslation {
|
||||||
* Default prop for navigating between screen components(React Navigation).
|
* Default prop for navigating between screen components(React Navigation).
|
||||||
*/
|
*/
|
||||||
navigation: Object;
|
navigation: Object;
|
||||||
|
|
||||||
/**
|
|
||||||
* Callback to be invoked when settings screen is focused.
|
|
||||||
*/
|
|
||||||
onSettingsScreenFocused: Function;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -10,7 +10,6 @@ import {
|
||||||
} from 'react-native';
|
} from 'react-native';
|
||||||
|
|
||||||
import { getName } from '../../app/functions';
|
import { getName } from '../../app/functions';
|
||||||
import { ColorSchemeRegistry } from '../../base/color-scheme';
|
|
||||||
import { translate } from '../../base/i18n';
|
import { translate } from '../../base/i18n';
|
||||||
import { Icon, IconWarning } from '../../base/icons';
|
import { Icon, IconWarning } from '../../base/icons';
|
||||||
import JitsiStatusBar from '../../base/modal/components/JitsiStatusBar';
|
import JitsiStatusBar from '../../base/modal/components/JitsiStatusBar';
|
||||||
|
@ -30,11 +29,6 @@ import styles, { PLACEHOLDER_TEXT_COLOR } from './styles';
|
||||||
|
|
||||||
type Props = AbstractProps & {
|
type Props = AbstractProps & {
|
||||||
|
|
||||||
/**
|
|
||||||
* The color schemed style of the Header component.
|
|
||||||
*/
|
|
||||||
_headerStyles: Object,
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Default prop for navigating between screen components(React Navigation).
|
* Default prop for navigating between screen components(React Navigation).
|
||||||
*/
|
*/
|
||||||
|
@ -425,8 +419,7 @@ class WelcomePage extends AbstractWelcomePage<*> {
|
||||||
*/
|
*/
|
||||||
function _mapStateToProps(state) {
|
function _mapStateToProps(state) {
|
||||||
return {
|
return {
|
||||||
..._abstractMapStateToProps(state),
|
..._abstractMapStateToProps(state)
|
||||||
_headerStyles: ColorSchemeRegistry.get(state, 'Header')
|
|
||||||
|
|
||||||
// _reducedUI: state['features/base/responsive-ui'].reducedUI
|
// _reducedUI: state['features/base/responsive-ui'].reducedUI
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in New Issue