Fix option processors path resolving (#6466)

This commit fixes a bug where Options Processors didn't traverse the entire options object and thus some processors didn't work as expected. For example, processing 'topBar.rightButtons' or topBar.background.translucent didn't work.
wix · Aug 12, 2020 · f37d465 · f37d465
1 parent 58f72f8
commit f37d465
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 10 deletions.
diff --git a/lib/src/commands/OptionsProcessor.test.ts b/lib/src/commands/OptionsProcessor.test.ts
@@ -134,6 +134,37 @@ describe('navigation options', () => {
     });
   });
 
+  it('supports multiple registered processors deep props', () => {
+    const options: Options = {
+      topBar: {
+        visible: false,
+        background: {
+          translucent: false,
+        },
+      },
+      bottomTabs: {
+        visible: false,
+      },
+    };
+
+    optionProcessorsRegistry.addProcessor('topBar.visible', () => true);
+    optionProcessorsRegistry.addProcessor('bottomTabs.visible', () => true);
+    optionProcessorsRegistry.addProcessor('topBar.background.translucent', () => true);
+
+    uut.processOptions(options, CommandName.SetRoot);
+    expect(options).toEqual({
+      topBar: {
+        visible: true,
+        background: {
+          translucent: true,
+        },
+      },
+      bottomTabs: {
+        visible: true,
+      },
+    });
+  });
+
   it('processes color keys', () => {
     const options: Options = {
       statusBar: { backgroundColor: 'red' },

diff --git a/lib/src/commands/OptionsProcessor.ts b/lib/src/commands/OptionsProcessor.ts
@@ -52,16 +52,11 @@ export class OptionsProcessor {
     parentOptions: object,
     onProcess: (key: string, parentOptions: object) => void,
     commandName: CommandName,
-    path?: string
+    parentPath?: string
   ) {
     forEach(objectToProcess, (value, key) => {
-      this.processWithRegisteredProcessor(
-        key,
-        value,
-        objectToProcess,
-        this.resolveObjectPath(key, path),
-        commandName
-      );
+      const objectPath = this.resolveObjectPath(key, parentPath);
+      this.processWithRegisteredProcessor(key, value, objectToProcess, objectPath, commandName);
       this.processColor(key, value, objectToProcess);
 
       if (!value) {
@@ -75,8 +70,7 @@ export class OptionsProcessor {
       onProcess(key, parentOptions);
 
       if (!isEqual(key, 'passProps') && (isObject(value) || isArray(value))) {
-        path = this.resolveObjectPath(key, path);
-        this.processObject(value, parentOptions, onProcess, commandName, path);
+        this.processObject(value, parentOptions, onProcess, commandName, objectPath);
       }
     });
   }