refactor OptionsProcessor

lib/src/commands/Commands.ts

@@ -5,6 +5,7 @@ export class Commands {
   private nativeCommandsSender;
   private layoutTreeParser;
   private layoutTreeCrawler;
+  private optionsProcessor = new OptionsProcessor();
 
   constructor(nativeCommandsSender, layoutTreeParser, layoutTreeCrawler) {
     this.nativeCommandsSender = nativeCommandsSender;
@@ -21,13 +22,13 @@ export class Commands {
 
   setDefaultOptions(options) {
     const input = _.cloneDeep(options);
-    OptionsProcessor.processOptions(input, this.layoutTreeCrawler.store);
+    this.optionsProcessor.processOptions(input, this.layoutTreeCrawler.store);
     this.nativeCommandsSender.setDefaultOptions(input);
   }
 
   setOptions(componentId, options) {
     const input = _.cloneDeep(options);
-    OptionsProcessor.processOptions(input, this.layoutTreeCrawler.store);
+    this.optionsProcessor.processOptions(input, this.layoutTreeCrawler.store);
     this.nativeCommandsSender.setOptions(componentId, input);
   }
 
@@ -48,7 +49,7 @@ export class Commands {
 
   push(onComponentId, componentData) {
     const input = _.cloneDeep(componentData);
-    OptionsProcessor.processOptions(input, this.layoutTreeCrawler.store);
+    this.optionsProcessor.processOptions(input, this.layoutTreeCrawler.store);
     const layout = this.layoutTreeParser.parse(input);
     this.layoutTreeCrawler.crawl(layout);
     return this.nativeCommandsSender.push(onComponentId, layout);
@@ -68,7 +69,7 @@ export class Commands {
 
   showOverlay(componentData) {
     const input = _.cloneDeep(componentData);
-    OptionsProcessor.processOptions(input, this.layoutTreeCrawler.store);
+    this.optionsProcessor.processOptions(input, this.layoutTreeCrawler.store);
 
     const layout = this.layoutTreeParser.parse(input);
     this.layoutTreeCrawler.crawl(layout);

lib/src/commands/LayoutTreeCrawler.ts

@@ -15,6 +15,7 @@ export interface LayoutNode {
 }
 
 export class LayoutTreeCrawler {
+  private optionsProcessor = new OptionsProcessor();
   constructor(
     private readonly uniqueIdProvider: any,
     public readonly store: any) {
@@ -29,7 +30,7 @@ export class LayoutTreeCrawler {
     if (node.type === LayoutType.Component) {
       this._handleComponent(node);
     }
-    OptionsProcessor.processOptions(node.data.options, this.store);
+    this.optionsProcessor.processOptions(node.data.options, this.store);
     _.forEach(node.children, this.crawl);
   }
 

lib/src/commands/OptionsProcessor.test.ts

@@ -1,58 +1,60 @@
 import { OptionsProcessor } from './OptionsProcessor';
-import { Store } from '../components/Store.mock';
+import { Store } from '../components/Store';
 
 describe('navigation options', () => {
+  let uut: OptionsProcessor;
   let options;
-  let store;
+  let store: Store;
   beforeEach(() => {
     options = {};
     store = new Store();
+    uut = new OptionsProcessor();
   });
 
   it('processes colors into numeric AARRGGBB', () => {
     options.someKeyColor = 'red';
     options.color = 'blue';
-    OptionsProcessor.processOptions(options, store);
+    uut.processOptions(options, store);
     expect(options.someKeyColor).toEqual(0xffff0000);
     expect(options.color).toEqual(0xff0000ff);
 
     options.someKeyColor = 'yellow';
-    OptionsProcessor.processOptions(options, store);
+    uut.processOptions(options, store);
     expect(options.someKeyColor).toEqual(0xffffff00);
   });
 
   it('processes numeric colors', () => {
     options.someKeyColor = '#123456';
-    OptionsProcessor.processOptions(options, store);
+    uut.processOptions(options, store);
     expect(options.someKeyColor).toEqual(0xff123456);
 
     options.someKeyColor = 0x123456ff; // wut
-    OptionsProcessor.processOptions(options, store);
+    uut.processOptions(options, store);
     expect(options.someKeyColor).toEqual(0xff123456);
   });
 
   it('process colors with rgb functions', () => {
     options.someKeyColor = 'rgb(255, 0, 255)';
-    OptionsProcessor.processOptions(options, store);
+    uut.processOptions(options, store);
     expect(options.someKeyColor).toEqual(0xffff00ff);
   });
 
   it('process colors with special words', () => {
     options.someKeyColor = 'fuchsia';
-    OptionsProcessor.processOptions(options, store);
+    uut.processOptions(options, store);
     expect(options.someKeyColor).toEqual(0xffff00ff);
   });
 
   it('process colors with hsla functions', () => {
     options.someKeyColor = 'hsla(360, 100%, 100%, 1.0)';
-    OptionsProcessor.processOptions(options, store);
+    uut.processOptions(options, store);
 
     expect(options.someKeyColor).toEqual(0xffffffff);
   });
 
   it('unknown colors return undefined', () => {
     options.someKeyColor = 'wut';
-    OptionsProcessor.processOptions(options, store);
+    uut.processOptions(options, store);
     expect(options.someKeyColor).toEqual(undefined);
   });
 
@@ -60,7 +62,7 @@ describe('navigation options', () => {
     options.otherKeyColor = 'red';
     options.yetAnotherColor = 'blue';
     options.andAnotherColor = 'rgb(0, 255, 0)';
-    OptionsProcessor.processOptions(options, store);
+    uut.processOptions(options, store);
     expect(options.otherKeyColor).toEqual(0xffff0000);
     expect(options.yetAnotherColor).toEqual(0xff0000ff);
     expect(options.andAnotherColor).toEqual(0xff00ff00);
@@ -68,14 +70,14 @@ describe('navigation options', () => {
 
   it('keys ending with Color case sensitive', () => {
     options.otherKey_color = 'red'; // eslint-disable-line camelcase
-    OptionsProcessor.processOptions(options, store);
+    uut.processOptions(options, store);
     expect(options.otherKey_color).toEqual('red');
   });
 
   it('any nested recursive keys ending with Color', () => {
     options.topBar = { textColor: 'red' };
     options.topBar.innerMostObj = { anotherColor: 'yellow' };
-    OptionsProcessor.processOptions(options, store);
+    uut.processOptions(options, store);
     expect(options.topBar.textColor).toEqual(0xffff0000);
     expect(options.topBar.innerMostObj.anotherColor).toEqual(0xffffff00);
   });
@@ -88,7 +90,7 @@ describe('navigation options', () => {
       myIcon: 'require("https://wix.github.io/react-native-navigation/_images/logo.png");',
       myOtherValue: 'value'
     };
-    OptionsProcessor.processOptions(options, store);
+    uut.processOptions(options, store);
 
     // As we can't import external images and we don't want to add an image here
     // I assign the icons to strings (what the require would generally look like)
@@ -100,13 +102,22 @@ describe('navigation options', () => {
     expect(options.topBar.myOtherValue).toEqual('value');
   });
 
-  it('register props for button options', () => {
+  it('passProps for Buttons options', () => {
     const passProps = { prop: 'prop' };
     options.rightButtons = [{ passProps, id: '1' }];
 
-    OptionsProcessor.processOptions({ o: options }, store);
+    uut.processOptions({ o: options }, store);
 
-    expect(store.setPropsForId).toBeCalledWith('1', passProps);
+    expect(store.getPropsForId('1')).toEqual(passProps);
+  });
+
+  it('passProps must be with id next to it', () => {
+    const passProps = { prop: 'prop' };
+    options.rightButtons = [{ passProps }];
+
+    uut.processOptions({ o: options }, store);
+
+    expect(store.getPropsForId('1')).toEqual({});
   });
 
   it('processes Options object', () => {
@@ -114,14 +125,14 @@ describe('navigation options', () => {
     options.topBar = { textColor: 'red' };
     options.topBar.innerMostObj = { anotherColor: 'yellow' };
 
-    OptionsProcessor.processOptions({ o: options }, store);
+    uut.processOptions({ o: options }, store);
 
     expect(options.topBar.textColor).toEqual(0xffff0000);
   });
 
   it('undefined value return undefined ', () => {
     options.someImage = undefined;
-    OptionsProcessor.processOptions(options, store);
+    uut.processOptions(options, store);
 
     expect(options.someImage).toEqual(undefined);
   });

lib/src/commands/OptionsProcessor.ts

@@ -3,26 +3,31 @@ import { processColor } from 'react-native';
 import * as resolveAssetSource from 'react-native/Libraries/Image/resolveAssetSource';
 
 export class OptionsProcessor {
-  static processOptions(options, store) {
+  public processOptions(options, store) {
     _.forEach(options, (value, key) => {
       if (!value) { return; }
 
       if (_.isEqual(key, 'color') || _.endsWith(key, 'Color')) {
         options[key] = processColor(value);
       }
+
       if (_.isEqual(key, 'icon') || _.isEqual(key, 'image') || _.endsWith(key, 'Icon') || _.endsWith(key, 'Image')) {
         options[key] = resolveAssetSource(options[key]);
       }
+
+      if (_.endsWith(key, 'Buttons')) {
+        this.saveButtonsPassProps(value, store);
+      }
+
       if (_.isObject(value) || _.isArray(value)) {
-        OptionsProcessor.processOptions(value, store);
-        OptionsProcessor.processArrayOptions(key, value, store);
+        this.processOptions(value, store);
       }
     });
   }
 
-  static processArrayOptions(key, array, store) {
+  private saveButtonsPassProps(array, store) {
     _.forEach(array, (value) => {
-      if (_.endsWith(key, 'Buttons') && value.passProps) {
+      if (value.passProps && value.id) {
         store.setPropsForId(value.id, value.passProps);
       }
     });

lib/src/components/Store.mock.ts

@@ -1 +0,0 @@
-export const { Store } = jest.genMockFromModule('./Store');