From afbb5bd3900379d7b8b865eada05aca50b6652d1 Mon Sep 17 00:00:00 2001
From: Guillaume Chau <alphadelta.fg@gmail.com>
Date: Fri, 29 Nov 2019 15:38:50 +0100
Subject: [PATCH] fix: enabled

---
 .../vue-apollo-composable/src/useQuery.ts     | 24 ++++++++++++-------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/packages/vue-apollo-composable/src/useQuery.ts b/packages/vue-apollo-composable/src/useQuery.ts
index 3995e47..61d3069 100644
--- a/packages/vue-apollo-composable/src/useQuery.ts
+++ b/packages/vue-apollo-composable/src/useQuery.ts
@@ -1,4 +1,4 @@
-import { ref, watch, onUnmounted, Ref, isRef } from '@vue/composition-api'
+import { ref, watch, onUnmounted, Ref, isRef, computed } from '@vue/composition-api'
 import Vue from 'vue'
 import { DocumentNode } from 'graphql'
 import ApolloClient, { OperationVariables, WatchQueryOptions, ObservableQuery, ApolloQueryResult, SubscribeToMoreOptions } from 'apollo-client'
@@ -60,7 +60,7 @@ export function useQuery<
    * Starts watching the query
    */
   function start () {
-    if (started) return
+    if (started || !isEnabled.value) return
     started = true
     loading.value = true
 
@@ -176,14 +176,19 @@ export function useQuery<
   }
 
   // Internal enabled returned to user
-  const enabled = ref(true)
+  // @TODO Doesn't fully work yet, need to initialize with option
+  const enabled = ref<boolean>()
+  const enabledOption = computed(() => !currentOptions.value || currentOptions.value.enabled == null || currentOptions.value.enabled)
+  const isEnabled = computed(() => !!((typeof enabled.value === 'boolean' && enabled.value) && enabledOption.value))
+
+  watch(enabled, value => {
+    if (value == null) {
+      enabled.value = enabledOption.value
+    }
+  })
 
   // Auto start & stop
-  watch(
-    () => enabled.value &&
-    // Enabled option
-    (!currentOptions.value || currentOptions.value.enabled == null || currentOptions.value.enabled)
-  , value => {
+  watch(isEnabled, value => {
     if (value) {
       start()
     } else {
@@ -198,7 +203,8 @@ export function useQuery<
     result,
     loading,
     error,
-    enabled,
+    // @TODO doesn't fully work yet
+    // enabled,
     start,
     stop,
     restart,