Do not clear isFetching state for subscriptions until they complete

Fixes: #2774
graphql · Sep 23, 2022 · fc0d949 · fc0d949
1 parent d483502
commit fc0d949
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/packages/graphiql-react/src/execution.tsx b/packages/graphiql-react/src/execution.tsx
@@ -232,11 +232,9 @@ export function ExecutionContextProvider(props: ExecutionContextProviderProps) {
             };
           }
 
-          setIsFetching(false);
           setResponse(formatResult(fullResponse));
         } else {
           const response = formatResult(result);
-          setIsFetching(false);
           setResponse(response);
         }
       };
@@ -294,6 +292,9 @@ export function ExecutionContextProvider(props: ExecutionContextProviderProps) {
         }
       } else {
         handleResponse(value);
+        if (queryId === queryIdRef.current) {
+          setIsFetching(false);
+        }
       }
     } catch (error) {
       setIsFetching(false);