Fix crash when mergeOptions were called before stack view was created (…

…wix#5945) Co-authored-by: Yogev Ben David <yogevbd@wix.com>
jinshin1013 · Feb 24, 2020 · e18dea4 · e18dea4
1 parent c835bbf
commit e18dea4
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/...id/app/src/main/java/com/reactnativenavigation/viewcontrollers/stack/StackController.java b/...id/app/src/main/java/com/reactnativenavigation/viewcontrollers/stack/StackController.java
@@ -96,7 +96,7 @@ public void onAttachToParent() {
 
     @Override
     public void mergeOptions(Options options) {
-        presenter.mergeOptions(options, this, getCurrentChild());
+        if (isViewShown()) presenter.mergeOptions(options, this, getCurrentChild());
         super.mergeOptions(options);
     }
 

diff --git a/...pp/src/test/java/com/reactnativenavigation/viewcontrollers/stack/StackControllerTest.java b/...pp/src/test/java/com/reactnativenavigation/viewcontrollers/stack/StackControllerTest.java
@@ -1039,6 +1039,12 @@ public void mergeChildOptions_updatesViewWithNewOptions() {
         verify(uut, times(1)).mergeChildOptions(optionsToMerge, vc);
     }
 
+    @Test
+    public void mergeOptions_doesNotMergeOptionsIfViewIsNotVisible() {
+        uut.mergeOptions(Options.EMPTY);
+        verify(presenter, times(0)).mergeOptions(any(), any(), any());
+    }
+
     @Test
     public void mergeChildOptions_updatesParentControllerWithNewOptions() {
         StackController uut = TestUtils.newStackController(activity)

diff --git a/package.json b/package.json
@@ -159,4 +159,4 @@
       }
     }
   }
-}
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -159,4 +159,4 @@ @@
           }
         }
       }
-    }
+    }