diff --git a/packages/react-navigation/src/PlatformHelpers.native.js b/packages/react-navigation/src/PlatformHelpers.native.js deleted file mode 100644 index 7c6ddb1a..00000000 --- a/packages/react-navigation/src/PlatformHelpers.native.js +++ /dev/null @@ -1,9 +0,0 @@ -import { - BackAndroid as DeprecatedBackAndroid, - BackHandler as ModernBackHandler, - MaskedViewIOS, -} from 'react-native'; - -const BackHandler = ModernBackHandler || DeprecatedBackAndroid; - -export { BackHandler, MaskedViewIOS }; diff --git a/packages/react-navigation/src/PlatformHelpers.web.js b/packages/react-navigation/src/PlatformHelpers.web.js deleted file mode 100644 index e5546299..00000000 --- a/packages/react-navigation/src/PlatformHelpers.web.js +++ /dev/null @@ -1,6 +0,0 @@ -import React from 'react'; -import { BackHandler, View } from 'react-native'; - -const MaskedViewIOS = () => {this.props.children}; - -export { BackHandler, MaskedViewIOS }; diff --git a/packages/react-navigation/src/createNavigationContainer.js b/packages/react-navigation/src/createNavigationContainer.js index a25bf499..ac5e8ecb 100644 --- a/packages/react-navigation/src/createNavigationContainer.js +++ b/packages/react-navigation/src/createNavigationContainer.js @@ -1,8 +1,7 @@ import React from 'react'; -import { AsyncStorage, Linking, Platform } from 'react-native'; +import { AsyncStorage, Linking, Platform, BackHandler } from 'react-native'; import { polyfill } from 'react-lifecycles-compat'; -import { BackHandler } from './PlatformHelpers'; import NavigationActions from './NavigationActions'; import getNavigation from './getNavigation'; import invariant from './utils/invariant'; diff --git a/packages/react-navigation/src/views/Header/Header.js b/packages/react-navigation/src/views/Header/Header.js index d129264f..d097eaae 100644 --- a/packages/react-navigation/src/views/Header/Header.js +++ b/packages/react-navigation/src/views/Header/Header.js @@ -9,8 +9,8 @@ import { View, I18nManager, ViewPropTypes, + MaskedViewIOS, } from 'react-native'; -import { MaskedViewIOS } from '../../PlatformHelpers'; import SafeAreaView from 'react-native-safe-area-view'; import HeaderTitle from './HeaderTitle';