Reject promise when trying to push two children with same id (#5855)

Reject promise when trying to push two children with the same if into the same stack. Related to #5821 Closes #5689 Co-authored-by: Yogev Ben David <yogevbd@wix.com>
wix · Jan 20, 2020 · 27ceea8 · 27ceea8
1 parent 9a361a4
commit 27ceea8
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 1 deletion.
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
@@ -146,6 +146,10 @@ public void onChildDestroyed(ViewController child) {
     }
 
     public void push(ViewController child, CommandListener listener) {
+        if (findController(child.getId()) != null) {
+            listener.onError("A stack can't contain two children with the same id");
+            return;
+        }
         final ViewController toRemove = stack.peek();
         if (size() > 0) backButtonHelper.addToPushedChild(child);
         child.setParentController(this);

diff --git a/...t/java/com/reactnativenavigation/viewcontrollers/bottomtabs/BottomTabsControllerTest.java b/...t/java/com/reactnativenavigation/viewcontrollers/bottomtabs/BottomTabsControllerTest.java
@@ -325,7 +325,7 @@ public void push() {
         uut.selectTab(3);
 
         SimpleViewController stackChild = new SimpleViewController(activity, childRegistry, "stackChild", new Options());
-        SimpleViewController stackChild2 = new SimpleViewController(activity, childRegistry, "stackChild", new Options());
+        SimpleViewController stackChild2 = new SimpleViewController(activity, childRegistry, "stackChild2", new Options());
 
         disablePushAnimation(stackChild, stackChild2);
         hideBackButton(stackChild2);

diff --git a/...pp/src/test/java/com/reactnativenavigation/viewcontrollers/stack/StackControllerTest.java b/...pp/src/test/java/com/reactnativenavigation/viewcontrollers/stack/StackControllerTest.java
@@ -244,6 +244,18 @@ public void push_backPressedDuringPushAnimationDestroysPushedScreenImmediately()
         inOrder.verify(backListener).onSuccess(any());
     }
 
+    @Test
+    public void push_rejectIfStackContainsChildWithId() {
+        disablePushAnimation(child1);
+        uut.push(child1, new CommandListenerAdapter());
+        assertThat(uut.size()).isEqualTo(1);
+
+        CommandListenerAdapter listener = spy(new CommandListenerAdapter());
+        uut.push(child1a, listener);
+        verify(listener).onError(any());
+        assertThat(uut.size()).isEqualTo(1);
+    }
+
     @Test
     public void animateSetRoot() {
         disablePushAnimation(child1, child2, child3);