refactor: apply feedback

felangel · Nov 29, 2021 · 0d737fe · 0d737fe
1 parent adb523c
commit 0d737fe
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/packages/bloc/lib/src/bloc_base.dart b/packages/bloc/lib/src/bloc_base.dart
@@ -18,6 +18,10 @@ abstract class Emittable<State extends Object?> {
   void emit(State state);
 }
 
+/// A [StateStreamable] which must be closed when no longer in use.
+abstract class StateStreamableSource<State>
+    implements StateStreamable<State>, Closable {}
+
 /// An object which must be closed when no longer in use.
 abstract class Closable {
   /// Closes the current instance.
@@ -40,7 +44,7 @@ abstract class ErrorSink implements Closable {
 /// both [Bloc] and [Cubit].
 /// {@endtemplate}
 abstract class BlocBase<State>
-    implements StateStreamable<State>, Emittable<State>, ErrorSink {
+    implements StateStreamableSource<State>, Emittable<State>, ErrorSink {
   /// {@macro bloc_base}
   BlocBase(this._state) {
     // ignore: invalid_use_of_protected_member

diff --git a/packages/flutter_bloc/lib/src/bloc_provider.dart b/packages/flutter_bloc/lib/src/bloc_provider.dart
@@ -34,7 +34,7 @@ mixin BlocProviderSingleChildWidget on SingleChildWidget {}
 /// ```
 ///
 /// {@endtemplate}
-class BlocProvider<T extends StateStreamable<Object?>>
+class BlocProvider<T extends StateStreamableSource<Object?>>
     extends SingleChildStatelessWidget with BlocProviderSingleChildWidget {
   /// {@macro bloc_provider}
   const BlocProvider({
@@ -92,7 +92,7 @@ class BlocProvider<T extends StateStreamable<Object?>>
   /// ```dart
   /// BlocProvider.of<BlocA>(context);
   /// ```
-  static T of<T extends StateStreamable<Object?>>(
+  static T of<T extends StateStreamableSource<Object?>>(
     BuildContext context, {
     bool listen = false,
   }) {
@@ -129,11 +129,7 @@ class BlocProvider<T extends StateStreamable<Object?>>
           )
         : InheritedProvider<T>(
             create: _create,
-            dispose: (_, bloc) {
-              if (bloc is Closable) {
-                (bloc as Closable).close();
-              }
-            },
+            dispose: (_, bloc) => bloc.close(),
             startListening: _startListening,
             child: child,
             lazy: lazy,