fix: fix useQuery keeping old fetch closure

Author: Hoang Pham

Sources/SwiftUIQuery/SwiftUIQuery.swift

@@ -339,7 +339,7 @@ public typealias InitialDataFunction<TData: Sendable> = @Sendable () -> TData?
 
 /// Configuration options for queries
 /// Equivalent to TanStack Query's QueryOptions
-public struct QueryOptions<TData: Sendable, TKey: QueryKey>: Sendable {
+public struct QueryOptions<TData: Sendable, TKey: QueryKey>: Sendable, Equatable {
     /// The query key that uniquely identifies this query
     public let queryKey: TKey
     /// The function that will be called to fetch data
@@ -367,6 +367,15 @@ public struct QueryOptions<TData: Sendable, TKey: QueryKey>: Sendable {
     /// Whether this query is enabled (will fetch automatically)
     public let enabled: Bool
 
+    public static func == (lhs: QueryOptions<TData, TKey>, rhs: QueryOptions<TData, TKey>) -> Bool {
+        lhs.queryKey == rhs.queryKey &&
+            lhs.staleTime == rhs.staleTime &&
+            lhs.gcTime == rhs.gcTime &&
+            lhs.refetchTriggers == rhs.refetchTriggers &&
+            lhs.refetchOnAppear == rhs.refetchOnAppear &&
+            lhs.enabled == rhs.enabled
+    }
+
     public init(
         queryKey: TKey,
         queryFn: @escaping QueryFunction<TData, TKey>,

Sources/SwiftUIQuery/UseInfiniteQuery.swift

@@ -285,71 +285,6 @@ public struct UseInfiniteQuery<
         .onChange(of: options) { newOptions in
             observer.setOptions(newOptions)
         }
-//        .onChange(of: options.enabled) { newEnabled in
-//            // Update observer options when enabled state changes
-//            // Create new options using the new enabled value
-//            let newOptions = InfiniteQueryOptions<TData, QueryError, TKey, TPageParam>(
-//                queryKey: options.queryKey,
-//                queryFn: options.queryFn,
-//                getNextPageParam: options.getNextPageParam,
-//                getPreviousPageParam: options.getPreviousPageParam,
-//                initialPageParam: options.initialPageParam,
-//                maxPages: options.maxPages,
-//                retryConfig: options.retryConfig,
-//                networkMode: options.networkMode,
-//                staleTime: options.staleTime,
-//                gcTime: options.gcTime,
-//                refetchTriggers: options.refetchTriggers,
-//                refetchOnAppear: options.refetchOnAppear,
-//                structuralSharing: options.structuralSharing,
-//                meta: options.meta,
-//                enabled: newEnabled
-//            )
-//            observer.setOptions(newOptions)
-//        }
-//        .onChange(of: options.initialPageParam) { newInitialPageParam in
-//            // Update observer options when enabled state changes
-//            // Create new options using the new enabled value
-//            let newOptions = InfiniteQueryOptions<TData, QueryError, TKey, TPageParam>(
-//                queryKey: options.queryKey,
-//                queryFn: options.queryFn,
-//                getNextPageParam: options.getNextPageParam,
-//                getPreviousPageParam: options.getPreviousPageParam,
-//                initialPageParam: newInitialPageParam,
-//                maxPages: options.maxPages,
-//                retryConfig: options.retryConfig,
-//                networkMode: options.networkMode,
-//                staleTime: options.staleTime,
-//                gcTime: options.gcTime,
-//                refetchTriggers: options.refetchTriggers,
-//                refetchOnAppear: options.refetchOnAppear,
-//                structuralSharing: options.structuralSharing,
-//                meta: options.meta,
-//                enabled: options.enabled
-//            )
-//            observer.setOptions(newOptions)
-//        }
-//        .onChange(of: options.staleTime) { newStaleTime in
-//            // Update observer options when staleTime changes
-//            let newOptions = InfiniteQueryOptions<TData, QueryError, TKey, TPageParam>(
-//                queryKey: options.queryKey,
-//                queryFn: options.queryFn,
-//                getNextPageParam: options.getNextPageParam,
-//                getPreviousPageParam: options.getPreviousPageParam,
-//                initialPageParam: options.initialPageParam,
-//                maxPages: options.maxPages,
-//                retryConfig: options.retryConfig,
-//                networkMode: options.networkMode,
-//                staleTime: newStaleTime,
-//                gcTime: options.gcTime,
-//                refetchTriggers: options.refetchTriggers,
-//                refetchOnAppear: options.refetchOnAppear,
-//                structuralSharing: options.structuralSharing,
-//                meta: options.meta,
-//                enabled: options.enabled
-//            )
-//            observer.setOptions(newOptions)
-//        }
     }
 }
 

Sources/SwiftUIQuery/UseQuery.swift

@@ -168,42 +168,7 @@ public struct UseQuery<TData: Sendable, TKey: QueryKey, Content: View>: View {
         .onDisappear {
             observer.unsubscribe()
         }
-        .onChange(of: options.queryKey) { newKey in
-            let newOptions = QueryOptions<TData, TKey>(
-                queryKey: newKey,
-                queryFn: options.queryFn,
-                retryConfig: options.retryConfig,
-                networkMode: options.networkMode,
-                staleTime: options.staleTime,
-                gcTime: options.gcTime,
-                refetchTriggers: options.refetchTriggers,
-                refetchOnAppear: options.refetchOnAppear,
-                initialData: options.initialData,
-                initialDataFunction: options.initialDataFunction,
-                structuralSharing: options.structuralSharing,
-                meta: options.meta,
-                enabled: options.enabled
-            )
-            observer.setOptions(newOptions)
-        }
-        .onChange(of: options.enabled) { newEnabled in
-            // Update observer options when enabled state changes
-            // Create new options using the new enabled value
-            let newOptions = QueryOptions<TData, TKey>(
-                queryKey: options.queryKey,
-                queryFn: options.queryFn,
-                retryConfig: options.retryConfig,
-                networkMode: options.networkMode,
-                staleTime: options.staleTime,
-                gcTime: options.gcTime,
-                refetchTriggers: options.refetchTriggers,
-                refetchOnAppear: options.refetchOnAppear,
-                initialData: options.initialData,
-                initialDataFunction: options.initialDataFunction,
-                structuralSharing: options.structuralSharing,
-                meta: options.meta,
-                enabled: newEnabled // Use the new enabled value from closure
-            )
+        .onChange(of: options) { newOptions in
             observer.setOptions(newOptions)
         }
     }