Visitar URL original
[fix] removing BeamState from history on pop · austinstoker/packages@e3a5682 · GitHub
Skip to content

Commit e3a5682

Browse files
committed
[fix] removing BeamState from history on pop
- closes flutter#304
1 parent 19dfbac commit e3a5682

3 files changed

Lines changed: 88 additions & 7 deletions

File tree

‎package/lib/src/beam_page.dart‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,8 @@ class BeamPage extends Page {
6464
);
6565
}
6666

67+
delegate.removeLastBeamState();
68+
6769
location.update((state) => beamState);
6870
return true;
6971
}

‎package/lib/src/beamer_delegate.dart‎

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -476,10 +476,9 @@ class BeamerDelegate<T extends BeamState> extends RouterDelegate<BeamState>
476476
if (!canBeamBack) {
477477
return false;
478478
}
479-
beamStateHistory.removeLast();
480-
_parent?.beamStateHistory.removeLast();
481-
final state = beamStateHistory.removeLast();
482-
_parent?.beamStateHistory.removeLast();
479+
removeLastBeamState();
480+
// has to exist because canbeamBack
481+
final state = removeLastBeamState()!;
483482
update(
484483
state: createState!(state.copyWith(data: data)),
485484
transitionDelegate: beamBackTransitionDelegate,
@@ -687,8 +686,8 @@ class BeamerDelegate<T extends BeamState> extends RouterDelegate<BeamState>
687686
var redirectLocation;
688687

689688
if (guard.beamTo == null && guard.beamToNamed == null) {
690-
beamStateHistory.removeLast();
691-
state = createState!(beamStateHistory.last);
689+
final lastState = removeLastBeamState();
690+
state = createState!(lastState!);
692691
redirectLocation = locationBuilder(_state);
693692
} else if (guard.beamTo != null) {
694693
redirectLocation = guard.beamTo!(context);
@@ -704,7 +703,7 @@ class BeamerDelegate<T extends BeamState> extends RouterDelegate<BeamState>
704703

705704
_currentBeamLocation.removeListener(_updateFromLocation);
706705
if (guard.replaceCurrentStack && beamLocationHistory.isNotEmpty) {
707-
beamStateHistory.removeLast();
706+
removeLastBeamState();
708707
beamLocationHistory.removeLast();
709708
}
710709
_pushHistory(redirectLocation);
@@ -737,6 +736,14 @@ class BeamerDelegate<T extends BeamState> extends RouterDelegate<BeamState>
737736
_currentBeamLocation.addListener(_updateFromLocation);
738737
}
739738

739+
BeamState? removeLastBeamState() {
740+
if (beamStateHistory.isEmpty) {
741+
return null;
742+
}
743+
_parent?.removeLastBeamState();
744+
return beamStateHistory.removeLast();
745+
}
746+
740747
void _initializeFromParent() {
741748
state = createState!(_parent!.state);
742749
var location = locationBuilder(state);

‎package/test/beam_page_test.dart‎

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -299,6 +299,78 @@ void main() {
299299
expect(delegate.currentPages.last.key, ValueKey('book-1'));
300300
expect(delegate.state.uri.path, '/books/1');
301301
});
302+
303+
testWidgets('pop removes from beamStateHistory', (tester) async {
304+
final delegate = BeamerDelegate(
305+
locationBuilder: SimpleLocationBuilder(
306+
routes: {
307+
'/': (context, state) => Container(),
308+
'/test': (context, state) => Container(),
309+
'/test/2': (context, state) => Container(),
310+
'/xx': (context, state) => Container(),
311+
'/xx/2': (context, state) => Container(),
312+
},
313+
),
314+
);
315+
await tester.pumpWidget(
316+
MaterialApp.router(
317+
routeInformationParser: BeamerParser(),
318+
routerDelegate: delegate,
319+
),
320+
);
321+
delegate.beamToNamed('/test');
322+
await tester.pump();
323+
expect(delegate.beamStateHistory.length, 2);
324+
expect(delegate.beamStateHistory[0].uri.path, '/');
325+
expect(delegate.beamStateHistory[1].uri.path, '/test');
326+
expect(delegate.currentBeamLocation.state.uri.path, '/test');
327+
328+
delegate.beamToNamed('/test/2');
329+
await tester.pump();
330+
expect(delegate.beamStateHistory.length, 3);
331+
expect(delegate.beamStateHistory[0].uri.path, '/');
332+
expect(delegate.beamStateHistory[1].uri.path, '/test');
333+
expect(delegate.beamStateHistory[2].uri.path, '/test/2');
334+
expect(delegate.currentBeamLocation.state.uri.path, '/test/2');
335+
336+
delegate.navigator.pop();
337+
await tester.pump();
338+
expect(delegate.beamStateHistory.length, 2);
339+
expect(delegate.beamStateHistory[0].uri.path, '/');
340+
expect(delegate.beamStateHistory[1].uri.path, '/test');
341+
expect(delegate.currentBeamLocation.state.uri.path, '/test');
342+
343+
delegate.beamToNamed('/xx');
344+
await tester.pump();
345+
expect(delegate.beamStateHistory.length, 3);
346+
expect(delegate.beamStateHistory[0].uri.path, '/');
347+
expect(delegate.beamStateHistory[1].uri.path, '/test');
348+
expect(delegate.beamStateHistory[2].uri.path, '/xx');
349+
expect(delegate.currentBeamLocation.state.uri.path, '/xx');
350+
351+
delegate.beamToNamed('/xx/2');
352+
await tester.pump();
353+
expect(delegate.beamStateHistory.length, 4);
354+
expect(delegate.beamStateHistory[0].uri.path, '/');
355+
expect(delegate.beamStateHistory[1].uri.path, '/test');
356+
expect(delegate.beamStateHistory[2].uri.path, '/xx');
357+
expect(delegate.beamStateHistory[3].uri.path, '/xx/2');
358+
expect(delegate.currentBeamLocation.state.uri.path, '/xx/2');
359+
360+
delegate.navigator.pop();
361+
await tester.pump();
362+
expect(delegate.beamStateHistory.length, 3);
363+
expect(delegate.beamStateHistory[0].uri.path, '/');
364+
expect(delegate.beamStateHistory[1].uri.path, '/test');
365+
expect(delegate.beamStateHistory[2].uri.path, '/xx');
366+
expect(delegate.currentBeamLocation.state.uri.path, '/xx');
367+
368+
delegate.beamBack();
369+
expect(delegate.beamStateHistory.length, 2);
370+
expect(delegate.beamStateHistory[0].uri.path, '/');
371+
expect(delegate.beamStateHistory[1].uri.path, '/test');
372+
expect(delegate.currentBeamLocation.state.uri.path, '/test');
373+
});
302374
});
303375

304376
group('Transitions', () {

0 commit comments

Comments
 (0)