From 46a22e54dc74299e608302d9c80f8375de878c2f Mon Sep 17 00:00:00 2001 From: Anton Kuznetsov Date: Fri, 17 Nov 2017 18:16:55 +0300 Subject: [PATCH] Fix an error with ExNavigationReducer --- src/ExNavigationReducer.js | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/ExNavigationReducer.js b/src/ExNavigationReducer.js index 1d35c73..78dc33f 100644 --- a/src/ExNavigationReducer.js +++ b/src/ExNavigationReducer.js @@ -81,10 +81,12 @@ class ExNavigationReducer { } static [ActionTypes.REMOVE_NAVIGATOR](state, { navigatorUID }) { - const currentNavigatorUID = - (navigatorsToRestore.length && - navigatorsToRestore[navigatorsToRestore.length - 1]) || - state.navigators[navigatorUID].parentNavigatorUID; + let currentNavigatorUID = null + if (navigatorsToRestore.length) { + currentNavigatorUID = navigatorsToRestore[navigatorsToRestore.length - 1] + } else if (state.navigators[navigatorUID]) { + currentNavigatorUID = state.navigators[navigatorUID].parentNavigatorUID + } navigatorsToRestore.pop(); return { ...state,