Selaa lähdekoodia

Revert "Add previous screen at index 0 when popping"

This reverts commit db567ea7b3.
Guy Carmeli 7 vuotta sitten
vanhempi
commit
f64791a720

+ 3
- 3
lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/StackController.java Näytä tiedosto

105
                 getView().removeView(toRemove.getView());
105
                 getView().removeView(toRemove.getView());
106
                 listener.onSuccess(child.getId());
106
                 listener.onSuccess(child.getId());
107
             }
107
             }
108
-        } else {
109
-            listener.onSuccess(child.getId());
110
         }
108
         }
111
     }
109
     }
112
 
110
 
140
         final ViewController appearing = stack.peek();
138
         final ViewController appearing = stack.peek();
141
         disappearing.onViewWillDisappear();
139
         disappearing.onViewWillDisappear();
142
         appearing.onViewWillAppear();
140
         appearing.onViewWillAppear();
143
-        getView().onChildWillDisappear(disappearing.options, appearing.options, () -> getView().addView(appearing.getView(), 0));
141
+        getView().onChildWillDisappear(disappearing.options, appearing.options, () ->
142
+                getView().addView(appearing.getView())
143
+        );
144
 
144
 
145
         if (disappearing.options.animated.isTrueOrUndefined()) {
145
         if (disappearing.options.animated.isTrueOrUndefined()) {
146
             animator.pop(disappearing.getView(), () -> finishPopping(disappearing, listener));
146
             animator.pop(disappearing.getView(), () -> finishPopping(disappearing, listener));

+ 2
- 4
lib/android/app/src/test/java/com/reactnativenavigation/viewcontrollers/StackControllerTest.java Näytä tiedosto

76
     @Test
76
     @Test
77
     public void push() {
77
     public void push() {
78
         assertThat(uut.isEmpty()).isTrue();
78
         assertThat(uut.isEmpty()).isTrue();
79
-        CommandListenerAdapter listener = spy(new CommandListenerAdapter());
80
-        uut.push(child1, listener);
79
+        uut.push(child1, new CommandListenerAdapter());
81
         assertContainsOnlyId(child1.getId());
80
         assertContainsOnlyId(child1.getId());
82
-        verify(listener, times(1)).onSuccess(child1.getId());
83
     }
81
     }
84
 
82
 
85
     @Test
83
     @Test
204
     }
202
     }
205
 
203
 
206
     @Test
204
     @Test
207
-    public void pop_doesNothingWhenZeroOrOneChild() {
205
+    public void popDoesNothingWhenZeroOrOneChild() {
208
         assertThat(uut.isEmpty()).isTrue();
206
         assertThat(uut.isEmpty()).isTrue();
209
         uut.pop(new CommandListenerAdapter());
207
         uut.pop(new CommandListenerAdapter());
210
         assertThat(uut.isEmpty()).isTrue();
208
         assertThat(uut.isEmpty()).isTrue();