Ensure subscription state is set before calling onSubscriptionData

This will make sure `onSubscriptionData` has access to the most up to date subscription result. Relates to #3139.
apollographql · Jun 21, 2019 · 7aad988 · 7aad988
1 parent 876286f
commit 7aad988
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/packages/hooks/src/data/SubscriptionData.ts b/packages/hooks/src/data/SubscriptionData.ts
@@ -103,18 +103,18 @@ export class SubscriptionData<
   private updateCurrentData(result: SubscriptionResult<TData>) {
     const { onSubscriptionData } = this.getOptions();
 
+    this.updateResult({
+      data: result.data,
+      loading: false,
+      error: undefined
+    });
+
     if (onSubscriptionData) {
       onSubscriptionData({
         client: this.refreshClient().client,
         subscriptionData: result
       });
     }
-
-    this.updateResult({
-      data: result.data,
-      loading: false,
-      error: undefined
-    });
   }
 
   private updateError(error: any) {