move focus action dispatch out of render method, prevent duplicate di…

…spatches
aksonov · Apr 17, 2016 · a74f7fd · a74f7fd
1 parent 29e2fd1
commit a74f7fd
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 2 deletions.
diff --git a/src/DefaultRenderer.js b/src/DefaultRenderer.js
@@ -29,6 +29,24 @@ export default class DefaultRenderer extends Component {
         navigationState: PropTypes.any,
     };
 
+    componentDidMount() {
+        this.dispatchFocusAction(this.props);
+    }
+
+    componentWillReceiveProps(nextProps) {
+        if (nextProps.navigationState !== this.props.navigationState) {
+          this.dispatchFocusAction(nextProps);
+        }
+    }
+
+    dispatchFocusAction({navigationState}) {
+        if (!navigationState || navigationState.component || navigationState.tabs) {
+            return;
+        }
+        const scene = navigationState.children[navigationState.index];
+        Actions.focus({scene});
+    }
+
     getChildContext() {
         return {
             navigationState: this.props.navigationState,
@@ -54,7 +72,6 @@ export default class DefaultRenderer extends Component {
 
         const selected = navigationState.children[navigationState.index];
         //return <DefaultRenderer key={selected.key} navigationState={selected}/>
-        Actions.focus({scene: selected});
 
         let applyAnimation = selected.applyAnimation || navigationState.applyAnimation;
         let style = selected.style || navigationState.style;

diff --git a/src/Reducer.js b/src/Reducer.js
@@ -7,7 +7,7 @@
  *
  */
 
-import {PUSH_ACTION, POP_ACTION2, FOCUS_ACTION, JUMP_ACTION, INIT_ACTION, REPLACE_ACTION, RESET_ACTION, POP_ACTION, REFRESH_ACTION} from "./Actions";
+import {PUSH_ACTION, POP_ACTION2, JUMP_ACTION, INIT_ACTION, REPLACE_ACTION, RESET_ACTION, POP_ACTION, REFRESH_ACTION} from "./Actions";
 import assert from "assert";
 import {getInitialState} from "./State";