flutter_disposebag nnbd

Author: Nguyễn Thái Học

flutter_disposebag/lib/src/disposebag_mixin.dart

@@ -7,7 +7,7 @@ import 'package:meta/meta.dart';
 /// A mixin that provides the [DisposeBag] that helps disposing Streams and closing Sinks.
 @optionalTypeArgs
 mixin DisposeBagMixin<T extends StatefulWidget> on State<T> {
-  Completer<bool> _mockBagDisposed;
+  Completer<bool>? _mockBagDisposed;
 
   /// Set mock [DisposeBag] for testing purpose.
   /// Returns a [Future] that completes when [DisposeBag.dispose] completes.
@@ -21,7 +21,7 @@ mixin DisposeBagMixin<T extends StatefulWidget> on State<T> {
   //
   //
 
-  DisposeBag _bag;
+  DisposeBag? _bag;
 
   /// Get [DisposeBag]
   @protected
@@ -35,9 +35,10 @@ mixin DisposeBagMixin<T extends StatefulWidget> on State<T> {
   @override
   void dispose() {
     final future = _bag?.dispose();
+    _bag = null;
 
-    if (future != null && _mockBagDisposed != null) {
-      _mockBagDisposed.complete(future);
+    if (future != null) {
+      _mockBagDisposed?.complete(future);
     }
 
     super.dispose();

flutter_disposebag/pubspec.yaml

@@ -7,11 +7,12 @@ repository: https://github.com/hoc081098/disposebag/tree/master/flutter_disposeb
 issue_tracker: https://github.com/hoc081098/disposebag/issues
 
 environment:
-  sdk: '>=2.7.0 <3.0.0'
+  sdk: '>=2.12.0-0 <3.0.0'
 
 dependencies:
   meta: ^1.1.6
-  disposebag: '>=1.0.0 <2.0.0'
+  disposebag:
+    path: ../
   flutter:
     sdk: flutter
 

flutter_disposebag/test/flutter_disposebag_test.dart

@@ -10,14 +10,14 @@ const buttonKey = Key('button_key');
 class MyWidget extends StatefulWidget {
   final DisposeBag disposeBag;
 
-  MyWidget({this.disposeBag}) : super(key: key);
+  MyWidget({required this.disposeBag}) : super(key: key);
 
   @override
   _MyWidgetState createState() => _MyWidgetState();
 }
 
 class _MyWidgetState extends State<MyWidget> with DisposeBagMixin {
-  Future<bool> disposed;
+  late Future<bool> disposed;
 
   @override
   void initState() {
@@ -52,29 +52,31 @@ class _MyWidgetState extends State<MyWidget> with DisposeBagMixin {
 
 void main() {
   group('DisposeBagMixin', () {
-    DisposeBag disposeBag;
+    late DisposeBag disposeBag;
 
     setUp(() {
       disposeBag = DisposeBag();
     });
 
-    testWidgets('DisposeBagMixin.disposed', (tester) async {
-      final myWidget = MyWidget(disposeBag: disposeBag);
-      await tester.pumpWidget(myWidget);
+    testWidgets('DisposeBagMixin.disposed', (tester) {
+      return tester.runAsync(() async {
+        final myWidget = MyWidget(disposeBag: disposeBag);
+        await tester.pumpWidget(myWidget);
 
-      final disposed = key.currentState.disposed;
+        final disposed = key.currentState!.disposed;
 
-      final button = find.byKey(buttonKey);
-      expect(button, findsOneWidget);
+        final button = find.byKey(buttonKey);
+        expect(button, findsOneWidget);
 
-      await tester.tap(button);
-      await tester.pumpAndSettle();
-      expect(disposeBag.length, 2);
+        await tester.tap(button);
+        await tester.pumpAndSettle();
+        expect(disposeBag.length, 2);
 
-      await tester.pumpWidget(Container());
-      await tester.runAsync(() => disposed);
+        await tester.pumpWidget(Container());
+        await disposed;
 
-      expect(disposeBag.isDisposed, isTrue);
+        expect(disposeBag.isDisposed, isTrue);
+      });
     });
   });
 }