Merge pull request #500 from Goddchen/fix/pop-to-named-break

Fix: popToNamed(...), need to break from the while loop when entry found
slovnicki · Apr 5, 2022 · cab91f7 · cab91f7
2 parents 0c653f8 + 8edecbe
commit cab91f7
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 1 deletion.
diff --git a/package/lib/src/beamer_delegate.dart b/package/lib/src/beamer_delegate.dart
@@ -74,7 +74,7 @@ class BeamerDelegate extends RouterDelegate<RouteInformation>
  /// `*App.router` and at least one more [Beamer] in the Widget tree.
  BeamerDelegate? get parent => _parent;
  set parent(BeamerDelegate? parent) {
- if(parent == null && _parent != null) {
+ if (parent == null && _parent != null) {
  _parent!.removeListener(_updateFromParent);
  _parent!._children.remove(this);
  _parent = null;
@@ -609,6 +609,7 @@ class BeamerDelegate extends RouterDelegate<RouteInformation>
  } else {
  beamingHistory.last.history
  .removeRange(index, beamingHistory.last.history.length);
+ break;
  }
  }
  beamToNamed(

diff --git a/package/test/beamer_delegate_test.dart b/package/test/beamer_delegate_test.dart
@@ -706,4 +706,26 @@ void main() {
  '/t1/t2');
  });
  });
+
+ test('Properly preserve history part when using popToNamed(...)', () {
+ final delegate = BeamerDelegate(
+ locationBuilder: RoutesLocationBuilder(
+ routes: {
+ '/': (context, state, data) => Container(),
+ '/t1': (context, state, data) => Container(),
+ '/t2': (context, state, data) => Container(),
+ '/t3': (context, state, data) => Container(),
+ },
+ ),
+ );
+ delegate.beamToNamed('/t1');
+ delegate.beamToNamed('/t2');
+ delegate.beamToNamed('/t3');
+ delegate.popToNamed('/t2');
+
+ expect(
+ delegate.currentBeamLocation.history
+ .map((HistoryElement e) => e.routeInformation.location),
+ orderedEquals(<String>['/t1', '/t2']));
+ });
 }