fixed tests, remove Lifecycle object

lib/src/commands/Commands.test.ts

@@ -46,10 +46,10 @@ describe('Commands', () => {
       const passProps = {
         fn: () => 'Hello'
       };
-      expect(store.getPropsForComponentId('Component+UNIQUE_ID')).toEqual({});
+      expect(store.getPropsForId('Component+UNIQUE_ID')).toEqual({});
       uut.setRoot({ component: { name: 'asd', passProps } });
-      expect(store.getPropsForComponentId('Component+UNIQUE_ID')).toEqual(passProps);
-      expect(store.getPropsForComponentId('Component+UNIQUE_ID').fn()).toEqual('Hello');
+      expect(store.getPropsForId('Component+UNIQUE_ID')).toEqual(passProps);
+      expect(store.getPropsForId('Component+UNIQUE_ID').fn()).toEqual('Hello');
     });
 
     it('returns a promise with the resolved layout', async () => {
@@ -108,14 +108,14 @@ describe('Commands', () => {
 
     it('passProps into components', () => {
       const passProps = {};
-      expect(store.getPropsForComponentId('Component+UNIQUE_ID')).toEqual({});
+      expect(store.getPropsForId('Component+UNIQUE_ID')).toEqual({});
       uut.showModal({
         component: {
           name: 'com.example.MyScreen',
           passProps
         }
       });
-      expect(store.getPropsForComponentId('Component+UNIQUE_ID')).toEqual(passProps);
+      expect(store.getPropsForId('Component+UNIQUE_ID')).toEqual(passProps);
     });
 
     it('returns a promise with the resolved layout', async () => {

lib/src/commands/LayoutTreeCrawler.test.ts

@@ -48,9 +48,9 @@ describe('LayoutTreeCrawler', () => {
       type: LayoutType.BottomTabs, children: [
         { type: LayoutType.Component, data: { name: 'the name', passProps: { myProp: 123 } } }]
     };
-    expect(store.getPropsForComponentId('Component+UNIQUE_ID')).toEqual({});
+    expect(store.getPropsForId('Component+UNIQUE_ID')).toEqual({});
     uut.crawl(node);
-    expect(store.getPropsForComponentId('Component+UNIQUE_ID')).toEqual({ myProp: 123 });
+    expect(store.getPropsForId('Component+UNIQUE_ID')).toEqual({ myProp: 123 });
   });
 
   it('Components: injects options from original component class static property', () => {

lib/src/commands/LayoutTreeCrawler.ts

@@ -40,7 +40,7 @@ export class LayoutTreeCrawler {
   }
 
   _savePropsToStore(node) {
-    this.store.setPropsForComponentId(node.id, node.data.passProps);
+    this.store.setPropsForId(node.id, node.data.passProps);
   }
 
   _applyStaticOptions(node) {

lib/src/commands/OptionsProcessor.test.ts

@@ -106,7 +106,7 @@ describe('navigation options', () => {
 
     OptionsProcessor.processOptions({ o: options }, store);
 
-    expect(store.setPropsForComponentId).toBeCalledWith('1', passProps);
+    expect(store.setPropsForId).toBeCalledWith('1', passProps);
   });
 
   it('processes Options object', () => {

lib/src/components/ComponentWrapper.test.tsx

@@ -78,7 +78,7 @@ describe('ComponentWrapper', () => {
   });
 
   it('pulls props from the store and injects them into the inner component', () => {
-    store.setPropsForComponentId('component123', { numberProp: 1, stringProp: 'hello', objectProp: { a: 2 } });
+    store.setPropsForId('component123', { numberProp: 1, stringProp: 'hello', objectProp: { a: 2 } });
     const NavigationComponent = ComponentWrapper.wrap(componentName, MyComponent, store);
     const tree = renderer.create(<NavigationComponent componentId={'component123'} />);
     const originalComponentProps = tree.getInstance()!.originalComponentRef.props;
@@ -88,7 +88,7 @@ describe('ComponentWrapper', () => {
   it('updates props from store into inner component', () => {
     const NavigationComponent = ComponentWrapper.wrap(componentName, MyComponent, store);
     const tree = renderer.create(<TestParent ChildClass={NavigationComponent} />);
-    store.setPropsForComponentId('component1', { myProp: 'hello' });
+    store.setPropsForId('component1', { myProp: 'hello' });
     expect(childRef.originalComponentRef.props.foo).toEqual(undefined);
     expect(childRef.originalComponentRef.props.myProp).toEqual(undefined);
     tree.getInstance()!.setState({ propsFromState: { foo: 'yo' } });
@@ -114,16 +114,16 @@ describe('ComponentWrapper', () => {
   it('saves self ref into store', () => {
     const NavigationComponent = ComponentWrapper.wrap(componentName, MyComponent, store);
     const tree = renderer.create(<NavigationComponent componentId={'component1'} />);
-    expect(store.getRefForComponentId('component1')).toBeDefined();
-    expect(store.getRefForComponentId('component1')).toBe(tree.getInstance());
+    expect(store.getRefForId('component1')).toBeDefined();
+    expect(store.getRefForId('component1')).toBe(tree.getInstance());
   });
 
   it('cleans ref from store on unMount', () => {
     const NavigationComponent = ComponentWrapper.wrap(componentName, MyComponent, store);
     const tree = renderer.create(<NavigationComponent componentId={'component1'} />);
-    expect(store.getRefForComponentId('component1')).toBeDefined();
+    expect(store.getRefForId('component1')).toBeDefined();
     tree.unmount();
-    expect(store.getRefForComponentId('component1')).toBeUndefined();
+    expect(store.getRefForId('component1')).toBeUndefined();
   });
 
   it('holds ref to OriginalComponent', () => {

lib/src/components/Lifecycle.ts

@@ -1,28 +0,0 @@
-export class Lifecycle {
-  constructor(private readonly store) {
-    this.componentDidAppear = this.componentDidAppear.bind(this);
-    this.componentDidDisappear = this.componentDidDisappear.bind(this);
-    this.onNavigationButtonPressed = this.onNavigationButtonPressed.bind(this);
-  }
-
-  private componentDidAppear(id) {
-    const ref = this.store.getRefForComponentId(id);
-    if (ref && ref.didAppear) {
-      ref.didAppear();
-    }
-  }
-
-  private componentDidDisappear(id) {
-    const ref = this.store.getRefForComponentId(id);
-    if (ref && ref.didDisappear) {
-      ref.didDisappear();
-    }
-  }
-
-  private onNavigationButtonPressed(params) {
-    const ref = this.store.getRefForComponentId(params.componentId);
-    if (ref && ref.onNavigationButtonPressed) {
-      ref.onNavigationButtonPressed(params.buttonId);
-    }
-  }
-}