From cf2550a2909d0cb957324fe114acacb431a5f33a Mon Sep 17 00:00:00 2001
From: Kingkor Roy Tirtho <krtirtho@gmail.com>
Date: Tue, 28 Feb 2023 22:21:20 +0600
Subject: [PATCH] fix(fl_query_hooks): query/mutation reset to initial memoized
 values on hot reload

---
 .../lib/src/use_infinite_query.dart           | 22 +++++++++----------
 .../fl_query_hooks/lib/src/use_mutation.dart  |  5 +++--
 .../fl_query_hooks/lib/src/use_query.dart     |  7 +++---
 3 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/packages/fl_query_hooks/lib/src/use_infinite_query.dart b/packages/fl_query_hooks/lib/src/use_infinite_query.dart
index 1a5f012..e09decf 100644
--- a/packages/fl_query_hooks/lib/src/use_infinite_query.dart
+++ b/packages/fl_query_hooks/lib/src/use_infinite_query.dart
@@ -22,8 +22,8 @@ InfiniteQuery<DataType, ErrorType, PageType>
 }) {
   final rebuild = useUpdater();
   final client = useQueryClient();
-  final query = useMemoized(() {
-    return client.createInfiniteQuery<DataType, ErrorType, PageType>(
+  final query = useMemoized<InfiniteQuery<DataType, ErrorType, PageType>>(() {
+    final query = client.createInfiniteQuery<DataType, ErrorType, PageType>(
       queryKey,
       queryFn,
       initialParam: initialPage,
@@ -32,21 +32,19 @@ InfiniteQuery<DataType, ErrorType, PageType>
       refreshConfig: refreshConfig,
       retryConfig: retryConfig,
     );
-  }, [client, queryKey]);
+    return query;
+  }, [queryKey]);
 
   useEffect(() {
     return query.addListener(rebuild);
   }, [query]);
 
-  useEffect(
-    () {
-      if (enabled) {
-        query.fetch();
-      }
-      return null;
-    },
-    [enabled],
-  );
+  useEffect(() {
+    if (enabled) {
+      query.fetch();
+    }
+    return null;
+  }, [enabled]);
 
   useEffect(() {
     query.updateQueryFn(queryFn);
diff --git a/packages/fl_query_hooks/lib/src/use_mutation.dart b/packages/fl_query_hooks/lib/src/use_mutation.dart
index 7db8fa7..240b4f5 100644
--- a/packages/fl_query_hooks/lib/src/use_mutation.dart
+++ b/packages/fl_query_hooks/lib/src/use_mutation.dart
@@ -19,13 +19,14 @@ Mutation<DataType, ErrorType, VariablesType>
 }) {
   final rebuild = useUpdater();
   final client = useQueryClient();
-  final mutation = useMemoized(() {
+  final mutation =
+      useMemoized<Mutation<DataType, ErrorType, VariablesType>>(() {
     return client.createMutation<DataType, ErrorType, VariablesType>(
       mutationKey,
       mutationFn,
       retryConfig: retryConfig,
     );
-  }, [client, mutationKey]);
+  }, [mutationKey]);
 
   final recoveryData = useState<RecoveryType?>(null);
 
diff --git a/packages/fl_query_hooks/lib/src/use_query.dart b/packages/fl_query_hooks/lib/src/use_query.dart
index 4a50816..6a47c32 100644
--- a/packages/fl_query_hooks/lib/src/use_query.dart
+++ b/packages/fl_query_hooks/lib/src/use_query.dart
@@ -21,8 +21,8 @@ Query<DataType, ErrorType> useQuery<DataType, ErrorType>(
 }) {
   final rebuild = useUpdater();
   final client = useQueryClient();
-  final query = useMemoized(() {
-    return client.createQuery<DataType, ErrorType>(
+  final query = useMemoized<Query<DataType, ErrorType>>(() {
+    final query = client.createQuery<DataType, ErrorType>(
       queryKey,
       queryFn,
       initial: initial,
@@ -30,7 +30,8 @@ Query<DataType, ErrorType> useQuery<DataType, ErrorType>(
       refreshConfig: refreshConfig,
       retryConfig: retryConfig,
     );
-  }, [client, queryKey]);
+    return query;
+  }, [queryKey]);
 
   useEffect(() {
     return query.addListener(rebuild);