Merge pull request #734 from MarcoAFC/master

fix: widget module disposing
Flutterando · Jun 2, 2022 · 48c3a8d · 48c3a8d
2 parents c513de7 + 4982c98
commit 48c3a8d
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 10 deletions.
diff --git a/flutter_modular/lib/src/domain/services/module_service.dart b/flutter_modular/lib/src/domain/services/module_service.dart
@@ -6,7 +6,7 @@ import '../../shared/either.dart';
 abstract class ModuleService {
   Either<ModularError, Unit> start(RouteContext module);
   Either<ModularError, Unit> bind(BindContext module);
-  Either<ModularError, Unit> unbind<T extends BindContext>();
+  Either<ModularError, Unit> unbind<T extends BindContext>({Type? type});
   Either<ModularError, Unit> finish();
   Future<Either<ModularError, bool>> isModuleReady<M extends Module>();
 }
diff --git a/flutter_modular/lib/src/domain/usecases/unbind_module.dart b/flutter_modular/lib/src/domain/usecases/unbind_module.dart
@@ -3,7 +3,7 @@ import '../../shared/either.dart';
 import '../services/module_service.dart';
 
 abstract class UnbindModule {
-  Either<ModularError, Unit> call<T extends BindContext>();
+  Either<ModularError, Unit> call<T extends BindContext>({Type? type});
 }
 
 class UnbindModuleImpl implements UnbindModule {
@@ -12,7 +12,7 @@ class UnbindModuleImpl implements UnbindModule {
   UnbindModuleImpl(this.moduleService);
 
   @override
-  Either<ModularError, Unit> call<T extends BindContext>() {
-    return moduleService.unbind<T>();
+  Either<ModularError, Unit> call<T extends BindContext>({Type? type}) {
+    return moduleService.unbind<T>(type: type);
   }
 }
diff --git a/flutter_modular/lib/src/infra/services/module_service_impl.dart b/flutter_modular/lib/src/infra/services/module_service_impl.dart
@@ -32,8 +32,8 @@ class ModuleServiceImpl extends ModuleService {
   }
 
   @override
-  Either<ModularError, Unit> unbind<T extends BindContext>() {
-    tracker.injector.removeBindContext<T>();
+  Either<ModularError, Unit> unbind<T extends BindContext>({Type? type}) {
+    tracker.injector.removeBindContext<T>(type: type);
     return right(unit);
   }
 }
diff --git a/flutter_modular/lib/src/presenter/widgets/widget_module.dart b/flutter_modular/lib/src/presenter/widgets/widget_module.dart
@@ -110,6 +110,6 @@ class _ModularProviderState<T extends BindContext>
   @override
   void dispose() {
     super.dispose();
-    injector.get<UnbindModule>().call<T>();
+    injector.get<UnbindModule>().call<T>(type: widget.module.runtimeType);
   }
 }
diff --git a/flutter_modular/pubspec.yaml b/flutter_modular/pubspec.yaml
@@ -13,6 +13,12 @@ dependencies:
   flutter:
     sdk: flutter
 
+dependency_overrides:
+  modular_core:
+    path: ../modular_core
+  modular_interfaces:
+    path: ../modular_interfaces
+
 dev_dependencies:
   flutter_lints: ^1.0.4
   mocktail: ^0.1.4

diff --git a/modular_core/lib/src/di/injector.dart b/modular_core/lib/src/di/injector.dart
@@ -134,8 +134,8 @@ class InjectorImpl<T> extends Injector<T> {
 
   @override
   @mustCallSuper
-  void removeBindContext<B extends BindContext>() {
-    final module = _allBindContexts.remove(_getType<B>());
+  void removeBindContext<B extends BindContext>({Type? type}) {
+    final module = _allBindContexts.remove(type ?? _getType<B>());
     if (module != null) {
       module.dispose();
       debugPrint("-- ${module.runtimeType} DISPOSED");

diff --git a/modular_interfaces/lib/src/di/injector.dart b/modular_interfaces/lib/src/di/injector.dart
@@ -30,7 +30,7 @@ abstract class Injector<T> {
   void destroy();
 
   /// remove [BindContext] by [Type]
-  void removeBindContext<B extends BindContext>();
+  void removeBindContext<T extends BindContext>({Type? type});
 
   /// checks if all asynchronous binds are ready to be used synchronously of all BindContext of Tree.
   Future<bool> isModuleReady<M extends BindContext>();