Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 1 addition & 6 deletions lib/get_instance/src/extension_instance.dart
Original file line number Diff line number Diff line change
Expand Up @@ -366,12 +366,7 @@ extension Inst on GetInterface {

if (dep == null) return false;

final _InstanceBuilderFactory builder;
if (dep.isDirty) {
builder = dep.lateRemove ?? dep;
} else {
builder = dep;
}
final builder = dep.lateRemove ?? dep;

if (builder.permanent && !force) {
Get.log(
Expand Down
4 changes: 4 additions & 0 deletions lib/get_navigation/src/routes/observers/route_observer.dart
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,10 @@ class GetObserver extends NavigatorObserver {
RouterReportManager.instance.reportCurrentRoute(previousRoute);
}

if (route is GetPageRoute) {
RouterReportManager.instance.reportRouteWillDispose(route);
}

// Here we use a 'inverse didPush set', meaning that we use
// previous route instead of 'route' because this is
// a 'inverse push'
Expand Down
134 changes: 134 additions & 0 deletions test/navigation/reopen_route_during_pop_test.dart
Original file line number Diff line number Diff line change
@@ -0,0 +1,134 @@
import 'package:flutter_test/flutter_test.dart';
import 'package:get/get.dart';
import 'package:material_ui/material_ui.dart';

final _created = <_FormController>[];

class _FormController extends GetxController {
_FormController() {
_created.add(this);
}

final textController = TextEditingController();

@override
void onClose() {
textController.dispose();
super.onClose();
}
}

class _FormBinding extends Bindings {
@override
void dependencies() {
Get.lazyPut(() => _FormController());
}
}

class _HomePage extends StatelessWidget {
const _HomePage();

@override
Widget build(BuildContext context) {
return const Scaffold(body: Text('home'));
}
}

class _FormPage extends GetView<_FormController> {
const _FormPage();

@override
Widget build(BuildContext context) {
return Scaffold(body: TextField(controller: controller.textController));
}
}

Future<void> _pumpApp(WidgetTester tester) async {
await tester.pumpWidget(
GetMaterialApp(
initialRoute: '/home',
getPages: [
GetPage(name: '/home', page: () => const _HomePage()),
GetPage(
name: '/form',
page: () => const _FormPage(),
binding: _FormBinding(),
),
],
),
);
}

Future<void> _openFormThenGoBackAndReopen(
WidgetTester tester, {
required Duration delayBeforeReopen,
}) async {
Get.toNamed('/form');
await tester.pumpAndSettle();

Get.back();
await tester.pump();
await tester.pump(delayBeforeReopen);

Get.toNamed('/form');
await tester.pumpAndSettle();
}

void main() {
setUp(_created.clear);
tearDown(() => Get.reset());

for (final delay in const [Duration.zero, Duration(milliseconds: 150)]) {
testWidgets(
'reopening a route while it is popping gives it a new controller '
'(reopened after ${delay.inMilliseconds}ms)',
(tester) async {
await _pumpApp(tester);
await _openFormThenGoBackAndReopen(tester, delayBeforeReopen: delay);

expect(_created, hasLength(2));
final [first, second] = _created;
expect(first.isClosed, isTrue);
expect(second.isClosed, isFalse);
expect(Get.find<_FormController>(), same(second));

final field = tester.widget<TextField>(find.byType(TextField));
expect(field.controller, same(second.textController));

await tester.enterText(find.byType(TextField), 'typed');
await tester.pump();
expect(second.textController.text, 'typed');
},
);
}

testWidgets('controller of the reopened route is deleted when it is closed', (
tester,
) async {
await _pumpApp(tester);
await _openFormThenGoBackAndReopen(
tester,
delayBeforeReopen: const Duration(milliseconds: 150),
);

Get.back();
await tester.pumpAndSettle();

expect(_created, hasLength(2));
expect(_created.every((c) => c.isClosed), isTrue);
expect(Get.isRegistered<_FormController>(), isFalse);
});

testWidgets('controller is deleted when its route is popped', (tester) async {
await _pumpApp(tester);

Get.toNamed('/form');
await tester.pumpAndSettle();
Get.back();
await tester.pumpAndSettle();

expect(_created, hasLength(1));
expect(_created.single.isClosed, isTrue);
expect(Get.isRegistered<_FormController>(), isFalse);
});
}