Add support for side-menu control via push()

Author: d4vidi

lib/Mock/Layouts/BottomTabsNode.ts

@@ -10,8 +10,10 @@ export default class BottomTabsNode extends ParentNode {
     this.selectedIndex = layout.data?.options?.bottomTabs?.currentTabIndex || 0;
   }
 
-  mergeOptions(options: Options) {
-    super.mergeOptions(options);
+  mergeOptions(_options: Options) {
+    super.mergeOptions(_options);
+
+    const { options } = this.data;
     if (options.bottomTabs?.currentTabIndex) {
       this.selectedIndex = options.bottomTabs?.currentTabIndex;
       switchTabByIndex(this, this.selectedIndex);

lib/Mock/Layouts/ParentNode.ts

@@ -35,6 +35,10 @@ export default class ParentNode extends Node {
     return this;
   }
 
+  applyOptions(_options: Options) {
+    this.parentNode?.applyOptions(_options);
+  }
+
   mergeOptions(options: Options) {
     this.data.options = _.mergeWith(this.data.options, options, (objValue, srcValue, key) => {
       if (_.isArray(objValue)) {

lib/Mock/Layouts/SideMenu.ts

@@ -20,6 +20,12 @@ export default class SideMenuRootNode extends ParentNode {
     }
   }
 
+  applyOptions(_options: Options) {
+    super.applyOptions(_options);
+
+    this._updateVisibility(_options);
+  }
+
   mergeOptions(options: Options) {
     super.mergeOptions(options);
 
@@ -34,15 +40,17 @@ export default class SideMenuRootNode extends ParentNode {
   }
 
   _updateVisibility(options: Options) {
-    if (options.sideMenu?.left?.visible) {
-      this.visibleChild = this._getLeftChild();
-      layoutActions.openSideMenu(this.visibleChild);
-    } else if (options.sideMenu?.right?.visible) {
-      this.visibleChild = this._getRightChild();
-      layoutActions.openSideMenu(this.visibleChild);
-    } else {
-      this.visibleChild = this._getCenterChild();
-      layoutActions.closeSideMenu(this.visibleChild);
+    if (options.sideMenu) {
+      if (options.sideMenu.left?.visible) {
+        this.visibleChild = this._getLeftChild();
+        layoutActions.openSideMenu(this.visibleChild);
+      } else if (options.sideMenu.right?.visible) {
+        this.visibleChild = this._getRightChild();
+        layoutActions.openSideMenu(this.visibleChild);
+      } else {
+        this.visibleChild = this._getCenterChild();
+        layoutActions.closeSideMenu(this.visibleChild);
+      }
     }
   }
 

lib/Mock/Stores/LayoutStore.ts

@@ -83,6 +83,11 @@ const setters = remx.setters({
   closeSideMenu(_layout: SideMenuNode) {
     state.sideMenu = undefined;
   },
+  applyOptions(componentId: string, options: Options) {
+    const layout = getters.getLayoutById(componentId);
+    if (layout) layout.applyOptions(options);
+    else console.warn(`[RNN error] Merge options failure: cannot find layout for: ${componentId}`);
+  },
   mergeOptions(componentId: string, options: Options) {
     const layout = getters.getLayoutById(componentId);
     if (layout) layout.mergeOptions(options);

lib/Mock/mocks/NativeCommandsSender.tsx

@@ -39,6 +39,7 @@ export class NativeCommandsSender {
       const layoutNode = LayoutNodeFactory.create(layout, stack);
       stack.getVisibleLayout().componentDidDisappear();
       LayoutStore.push(layoutNode, stack);
+      LayoutStore.applyOptions(layoutNode.nodeId, layoutNode.data.options);
       stack.getVisibleLayout().componentDidAppear();
       resolve(stack.getVisibleLayout().nodeId);
       this.reportCommandCompletion(CommandName.Push, commandId);