change export/import style for Util

Author: joenoon

src/DefaultRenderer.js

@@ -20,7 +20,7 @@ import {
 import TabBar from './TabBar';
 import NavBar from './NavBar';
 import Actions from './Actions';
-import Util from './Util';
+import { deepestExplicitValueForKey } from './Util';
 
 const {
   AnimatedView: NavigationAnimatedView,
@@ -82,8 +82,8 @@ export default class DefaultRenderer extends Component {
     // Since we always need to pass a style for the direction, we can avoid #526
     let style;
     if (getSceneStyle) {
-      const hideNavBar = Util.deepestExplicitValueForKey(props.navigationState, 'hideNavBar');
-      const hideTabBar = Util.deepestExplicitValueForKey(props.navigationState, 'hideTabBar');
+      const hideNavBar = deepestExplicitValueForKey(props.navigationState, 'hideNavBar');
+      const hideTabBar = deepestExplicitValueForKey(props.navigationState, 'hideTabBar');
       style = getSceneStyle({ ...props, hideNavBar, hideTabBar });
     }
 
@@ -129,7 +129,7 @@ export default class DefaultRenderer extends Component {
       selected = selected.children[selected.index];
     }
 
-    const hideNavBar = Util.deepestExplicitValueForKey(state, 'hideNavBar');
+    const hideNavBar = deepestExplicitValueForKey(state, 'hideNavBar');
     if (hideNavBar) {
       return null;
     }

src/TabBar.js

@@ -3,7 +3,7 @@ import { View } from 'react-native';
 import DefaultRenderer from './DefaultRenderer';
 import Actions from './Actions';
 import TabNavigator from 'react-native-tab-navigator';
-import Util from './Util';
+import { deepestExplicitValueForKey } from './Util';
 
 class TabBar extends Component {
 
@@ -27,7 +27,7 @@ class TabBar extends Component {
   render() {
     const state = this.props.navigationState;
     const selected = state.children[state.index];
-    const hideTabBar = Util.deepestExplicitValueForKey(state, 'hideTabBar');
+    const hideTabBar = deepestExplicitValueForKey(state, 'hideTabBar');
 
     const tabBarStyle = {};
 

src/Util.js

@@ -1,45 +1,41 @@
-export function assert(expr, failDescription) {
-  if (!expr) {
-    throw new Error(`[react-native-router-flux] ${failDescription}`);
-  }
-}
+// searches for the deepest explicitly set value for a key
+// in a navigationState tree.
+export function deepestExplicitValueForKey(navigationState, key) {
+  let current;
+  let selected = navigationState;
 
-export default {
-
-  // searches for the deepest explicitly set value for a key
-  // in a navigationState tree.
-  deepestExplicitValueForKey(navigationState, key) {
-    let current;
-    let selected = navigationState;
-
-    while (selected.hasOwnProperty('children')) {
-      if (!selected.tabs) {
-        // for pushed children, iterate through each, recording key value,
-        // until reaching the selected child
-        for (let i = 0; i < selected.index; i++) {
-          if (typeof(selected.children[i][key]) !== 'undefined') {
-            current = selected.children[i][key];
-          }
+  while (selected.hasOwnProperty('children')) {
+    if (!selected.tabs) {
+      // for pushed children, iterate through each, recording key value,
+      // until reaching the selected child
+      for (let i = 0; i < selected.index; i++) {
+        if (typeof(selected.children[i][key]) !== 'undefined') {
+          current = selected.children[i][key];
         }
       }
-      // set the new selected child and check for a key value
-      selected = selected.children[selected.index];
-      if (typeof(selected[key]) !== 'undefined') {
-        current = selected[key];
-      }
     }
-
-    // fallback to the root key value
-    if (typeof(current) === 'undefined') {
-      current = navigationState[key];
+    // set the new selected child and check for a key value
+    selected = selected.children[selected.index];
+    if (typeof(selected[key]) !== 'undefined') {
+      current = selected[key];
     }
+  }
 
-    return current;
-  },
-};
+  // fallback to the root key value
+  if (typeof(current) === 'undefined') {
+    current = navigationState[key];
+  }
+
+  return current;
+}
 
 export function assert(expr, failDescription) {
   if (!expr) {
     throw new Error(`[react-native-router-flux] ${failDescription}`);
   }
 }
+
+export default {
+  deepestExplicitValueForKey,
+  assert,
+};