fix(doOn): related ReactiveX/rxdart#683

dungngminh · Apr 20, 2023 · 54273b8 · 54273b8
1 parent fa12272
commit 54273b8
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 12 deletions.
diff --git a/lib/src/operators/do_on.dart b/lib/src/operators/do_on.dart
@@ -19,16 +19,14 @@ extension DoOnStreamExtensions<T> on Stream<T> {
     void Function()? done,
     void Function(Notification<T> notification)? each,
   }) =>
-      transform(
-        DoStreamTransformer(
-          onListen: listen,
-          onCancel: cancel,
-          onPause: pause,
-          onResume: resume,
-          onData: data,
-          onError: error,
-          onDone: done,
-          onEach: each,
-        ),
-      );
+      DoStreamTransformer(
+        onListen: listen,
+        onCancel: cancel,
+        onPause: pause,
+        onResume: resume,
+        onData: data,
+        onError: error,
+        onDone: done,
+        onEach: each,
+      ).bind(this);
 }
diff --git a/test/operators/do_on_test.dart b/test/operators/do_on_test.dart
@@ -1,6 +1,8 @@
 import 'package:rxdart_ext/rxdart_ext.dart';
 import 'package:test/test.dart';
 
+import '../utils.dart';
+
 void main() {
   group('doOn', () {
     test('works', () async {
@@ -33,5 +35,20 @@ void main() {
 
       await delay(10000);
     });
+
+    test('nullable', () {
+      nullableTest<String?>(
+        (s) => s.doOn(
+          listen: () {},
+          cancel: () {},
+          pause: () {},
+          resume: () {},
+          data: (v) {},
+          error: (e, s) {},
+          done: () {},
+          each: (n) {},
+        ),
+      );
+    });
   });
 }
diff --git a/test/utils.dart b/test/utils.dart
@@ -1,5 +1,8 @@
 void unawaited(Future<void> future) {}
 
+void nullableTest<R>(Stream<R> Function(Stream<String?> s) transform) =>
+    transform(Stream<String>.fromIterable(['1', '2', '3']));
+
 /// Generates a hash code for multiple [objects].
 int hashObjects(Iterable<int> objects) =>
     _finish(objects.fold(0, (h, i) => _combine(h, i.hashCode)));