From 8455b75dbd7913037f9692cc9bacdecf74bd6b01 Mon Sep 17 00:00:00 2001 From: Adam Miskiewicz Date: Wed, 28 Jun 2017 12:31:05 -0700 Subject: [PATCH] BackAndroid -> BackHandler --- src/PlatformHelpers.js | 2 +- src/PlatformHelpers.native.js | 6 +++--- src/createNavigationContainer.js | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/PlatformHelpers.js b/src/PlatformHelpers.js index e1490cd5..e69c1db4 100644 --- a/src/PlatformHelpers.js +++ b/src/PlatformHelpers.js @@ -6,6 +6,6 @@ export const Linking = { getInitialURL: () => Promise.reject('Unsupported platform'), }; -export const BackAndroid = { +export const BackHandler = { addEventListener: () => {}, }; diff --git a/src/PlatformHelpers.native.js b/src/PlatformHelpers.native.js index 49818d3c..de926796 100644 --- a/src/PlatformHelpers.native.js +++ b/src/PlatformHelpers.native.js @@ -2,10 +2,10 @@ import { BackAndroid as DeprecatedBackAndroid, - BackHandler, + BackHandler as ModernBackHandler, Linking, } from 'react-native'; -const BackAndroid = BackHandler || DeprecatedBackAndroid; +const BackHandler = ModernBackHandler || DeprecatedBackAndroid; -export { BackAndroid, Linking }; +export { BackHandler, Linking }; diff --git a/src/createNavigationContainer.js b/src/createNavigationContainer.js index 3256013b..43345be3 100644 --- a/src/createNavigationContainer.js +++ b/src/createNavigationContainer.js @@ -2,7 +2,7 @@ import React from 'react'; import invariant from './utils/invariant'; -import { BackAndroid, Linking } from './PlatformHelpers'; +import { BackHandler, Linking } from './PlatformHelpers'; import NavigationActions from './NavigationActions'; import addNavigationHelpers from './addNavigationHelpers'; @@ -154,7 +154,7 @@ export default function createNavigationContainer( return; } - this.subs = BackAndroid.addEventListener('backPress', () => + this.subs = BackHandler.addEventListener('hardwareBackPress', () => this.dispatch(NavigationActions.back()) );