fix(flutter): return callback results in case of futures to await

zino-hofmann · Aug 30, 2019 · c7d6fd1 · c7d6fd1
1 parent 617dde7
commit c7d6fd1
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 9 deletions.
diff --git a/packages/graphql/lib/src/core/observable_query.dart b/packages/graphql/lib/src/core/observable_query.dart
@@ -227,18 +227,16 @@ class ObservableQuery {
     callbacks ??= const <OnData>[];
     StreamSubscription<QueryResult> subscription;
 
-    subscription = stream.listen((QueryResult result) {
-      void handle(OnData callback) {
-        callback(result);
-      }
-
+    subscription = stream.listen((QueryResult result) async {
       if (!result.loading) {
-        callbacks.forEach(handle);
+        for (final callback in callbacks) {
+          await callback(result);
+        }
 
         queryManager.rebroadcastQueries();
 
         if (!result.optimistic) {
-          subscription.cancel();
+          await subscription.cancel();
           _onDataSubscriptions.remove(subscription);
 
           if (_onDataSubscriptions.isEmpty) {

diff --git a/packages/graphql_flutter/lib/src/widgets/mutation.dart b/packages/graphql_flutter/lib/src/widgets/mutation.dart
@@ -80,7 +80,7 @@ class MutationState extends State<Mutation> {
     if (widget.onCompleted != null) {
       return (QueryResult result) {
         if (!result.loading && !result.optimistic) {
-          widget.onCompleted(result.data);
+          return widget.onCompleted(result.data);
         }
       };
     }
@@ -122,7 +122,7 @@ class MutationState extends State<Mutation> {
         if (result.optimistic) {
           return optimisticUpdate(result);
         } else {
-          widgetUpdate(cache, result);
+          return widgetUpdate(cache, result);
         }
       }