From fd42d37841d8eda8fa46a3efc344ba0fe3eca804 Mon Sep 17 00:00:00 2001 From: aksonov Date: Mon, 1 Oct 2018 09:48:52 +0200 Subject: [PATCH] fix reducer error, bump version --- package.json | 2 +- src/Reducer.js | 6 ++---- src/navigationStore.js | 2 +- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 971416668..98568d0f7 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "react-native-router-flux", - "version": "4.0.4", + "version": "4.0.5", "description": "React Native Router using Flux architecture", "repository": { "type": "git", diff --git a/src/Reducer.js b/src/Reducer.js index e4bf7c911..d807e756b 100644 --- a/src/Reducer.js +++ b/src/Reducer.js @@ -3,11 +3,9 @@ import { NavigationActions, StackActions } from 'react-navigation'; import * as ActionConst from './ActionConst'; import { getActiveState, popPrevious } from './State'; -export default function createReducer(navigationStore) { +export default function createReducer() { return (state, action) => { - if (!navigationStore) { - navigationStore = require('./navigationStore').default; - } + const navigationStore = require('./navigationStore').default; const { type, routeName } = action; if (type === ActionConst.POP_TO) { let nextScene = ''; diff --git a/src/navigationStore.js b/src/navigationStore.js index 98839a472..f9c6ffc60 100644 --- a/src/navigationStore.js +++ b/src/navigationStore.js @@ -520,7 +520,7 @@ class NavigationStore { setCustomReducer = (Navigator) => { this.getStateForAction = Navigator.router.getStateForAction; - const reducer = createReducer(this); + const reducer = createReducer(); Navigator.router.getStateForAction = (cmd, state) => (this.reducer ? this.reducer(state, cmd) : reducer(state, cmd)); };