refactor

lib/android/app/src/main/java/com/reactnativenavigation/react/NavigationReactInitializer.java

@@ -20,6 +20,7 @@ public class NavigationReactInitializer implements ReactInstanceManager.ReactIns
 	}
 
 	public void onActivityCreated(NavigationActivity activity) {
+		reactInstanceManager.addReactInstanceEventListener(this);
 		waitingForAppLaunchEvent = true;
 	}
 
@@ -28,7 +29,6 @@ public class NavigationReactInitializer implements ReactInstanceManager.ReactIns
 			devPermissionRequest.askPermission(activity);
 		} else {
 			reactInstanceManager.onHostResume(activity, activity);
-			reactInstanceManager.addReactInstanceEventListener(this);
 			checkBundleThenPrepareReact(activity);
 		}
 	}

lib/src/containers/ContainerWrapper.test.js

@@ -7,15 +7,12 @@ import ContainerWrapper from './ContainerWrapper';
 import Store from './Store';
 
 describe('ContainerWrapper', () => {
-  let myContainerRef;
-  let testParentRef;
   let store;
   const containerName = 'example.MyContainer';
 
   class MyContainer extends Component {
     constructor(props) {
       super(props);
-      myContainerRef = this;
     }
 
     render() {
@@ -26,7 +23,6 @@ describe('ContainerWrapper', () => {
   class TestParent extends Component {
     constructor(props) {
       super(props);
-      testParentRef = this;
       this.ChildClass = props.ChildClass;
       this.state = { propsFromState: {} };
     }
@@ -34,7 +30,11 @@ describe('ContainerWrapper', () => {
     render() {
       const Child = this.ChildClass;
       return (
-        <Child containerId="container1" {...this.state.propsFromState} />
+        <Child
+          ref="child"
+          containerId="container1"
+          {...this.state.propsFromState}
+        />
       );
     }
   }
@@ -58,54 +58,55 @@ describe('ContainerWrapper', () => {
     expect(NavigationContainer).not.toBeInstanceOf(MyContainer);
     const tree = renderer.create(<NavigationContainer containerId={'container1'} />);
     expect(tree.toJSON().children).toEqual(['Hello, World!']);
-    expect(myContainerRef).toBeInstanceOf(MyContainer);
+    expect(tree.getInstance().originalContainerRef).toBeInstanceOf(MyContainer);
   });
 
   it('injects props from wrapper into original container', () => {
     const NavigationContainer = ContainerWrapper.wrap(containerName, MyContainer, store);
-    renderer.create(<NavigationContainer containerId={'container1'} myProp={'yo'} />);
-    expect(myContainerRef.props.myProp).toEqual('yo');
+    const tree = renderer.create(<NavigationContainer containerId={'container1'} myProp={'yo'} />);
+    expect(tree.getInstance().originalContainerRef.props.myProp).toEqual('yo');
   });
 
   it('updates props from wrapper into original container', () => {
     const NavigationContainer = ContainerWrapper.wrap(containerName, MyContainer, store);
-    renderer.create(<TestParent ChildClass={NavigationContainer} />);
-    expect(myContainerRef.props.foo).toEqual(undefined);
-    testParentRef.setState({ propsFromState: { foo: 'yo' } });
-    expect(myContainerRef.props.foo).toEqual('yo');
+    const tree = renderer.create(<TestParent ChildClass={NavigationContainer} />);
+    expect(tree.getInstance().refs.child.props.foo).toEqual(undefined);
+    tree.getInstance().setState({ propsFromState: { foo: 'yo' } });
+    expect(tree.getInstance().refs.child.props.foo).toEqual('yo');
   });
 
   it('pulls props from the store and injects them into the inner container', () => {
     store.setPropsForContainerId('container123', { numberProp: 1, stringProp: 'hello', objectProp: { a: 2 } });
     const NavigationContainer = ContainerWrapper.wrap(containerName, MyContainer, store);
-    renderer.create(<NavigationContainer containerId={'container123'} />);
-    expect(myContainerRef.props).toEqual({ containerId: 'container123', numberProp: 1, stringProp: 'hello', objectProp: { a: 2 } });
+    const tree = renderer.create(<NavigationContainer containerId={'container123'} />);
+    originalContainerProps = tree.getInstance().originalContainerRef.props;
+    expect(originalContainerProps).toEqual({ containerId: 'container123', numberProp: 1, stringProp: 'hello', objectProp: { a: 2 } });
   });
 
   it('updates props from store into inner container', () => {
     const NavigationContainer = ContainerWrapper.wrap(containerName, MyContainer, store);
-    renderer.create(<TestParent ChildClass={NavigationContainer} />);
+    const tree = renderer.create(<TestParent ChildClass={NavigationContainer} />);
     store.setPropsForContainerId('container1', { myProp: 'hello' });
-    expect(myContainerRef.props.foo).toEqual(undefined);
-    expect(myContainerRef.props.myProp).toEqual(undefined);
-    testParentRef.setState({ propsFromState: { foo: 'yo' } });
-    expect(myContainerRef.props.foo).toEqual('yo');
-    expect(myContainerRef.props.myProp).toEqual('hello');
+    expect(tree.getInstance().refs.child.originalContainerRef.props.foo).toEqual(undefined);
+    expect(tree.getInstance().refs.child.originalContainerRef.props.myProp).toEqual(undefined);
+    tree.getInstance().setState({ propsFromState: { foo: 'yo' } });
+    expect(tree.getInstance().refs.child.originalContainerRef.props.foo).toEqual('yo');
+    expect(tree.getInstance().refs.child.originalContainerRef.props.myProp).toEqual('hello');
   });
 
   it('protects id from change', () => {
     const NavigationContainer = ContainerWrapper.wrap(containerName, MyContainer, store);
-    renderer.create(<TestParent ChildClass={NavigationContainer} />);
-    expect(myContainerRef.props.containerId).toEqual('container1');
-    testParentRef.setState({ propsFromState: { id: 'ERROR' } });
-    expect(myContainerRef.props.containerId).toEqual('container1');
+    const tree = renderer.create(<TestParent ChildClass={NavigationContainer} />);
+    expect(tree.getInstance().refs.child.originalContainerRef.props.containerId).toEqual('container1');
+    tree.getInstance().setState({ propsFromState: { id: 'ERROR' } });
+    expect(tree.getInstance().refs.child.originalContainerRef.props.containerId).toEqual('container1');
   });
 
   it('assignes key by id', () => {
     const NavigationContainer = ContainerWrapper.wrap(containerName, MyContainer, store);
-    renderer.create(<NavigationContainer containerId={'container1'} />);
-    expect(myContainerRef.props.containerId).toEqual('container1');
-    expect(myContainerRef._reactInternalInstance.key).toEqual('container1');
+    const tree = renderer.create(<NavigationContainer containerId={'container1'} />);
+    expect(tree.getInstance().originalContainerRef.props.containerId).toEqual('container1');
+    expect(tree.getInstance().originalContainerRef._reactInternalInstance.key).toEqual('container1');
   });
 
   it('saves self ref into store', () => {
@@ -126,7 +127,8 @@ describe('ContainerWrapper', () => {
   it('holds ref to OriginalContainer', () => {
     const NavigationContainer = ContainerWrapper.wrap(containerName, MyContainer, store);
     const tree = renderer.create(<NavigationContainer containerId={'container1'} />);
-    expect(tree.getInstance().originalContainerRef).toBe(myContainerRef);
+    expect(tree.getInstance().originalContainerRef).toBeDefined();
+    expect(tree.getInstance().originalContainerRef).toBeInstanceOf(MyContainer);
   });
 
   it('cleans ref to internal container on unount', () => {