Merge branch 'main' of https://github.com/marc2332/dioxus-query

Author: marc2332

src/cached_result.rs

@@ -31,11 +31,11 @@ impl<T, E> CachedResult<T, E> {
     }
 
     /// Check if this result is stale yet
-    pub fn is_fresh(&self, stale_time: Duration) -> bool {
+    pub fn is_stale(&self, stale_time: Duration) -> bool {
         if let Some(instant) = self.instant {
-            instant.elapsed() < stale_time
+            instant.elapsed() > stale_time
         } else {
-            false
+            true
         }
     }
 
@@ -48,6 +48,10 @@ impl<T, E> CachedResult<T, E> {
     pub(crate) fn set_to_loading(&mut self) {
         self.state.set_loading();
         self.instant = Some(Instant::now());
+    }
+
+    /// Set this result as loaded
+    pub(crate) fn set_to_loaded(&mut self) {
         self.has_been_loaded = true;
     }
 }

src/use_query.rs

@@ -67,6 +67,7 @@ where
     client: UseQueryClient<T, E, K>,
     registry_entry: RegistryEntry<K>,
     scope_id: ScopeId,
+    stale_time: Duration,
 }
 
 impl<T, E, K: Eq + Hash> Drop for UseQueryCleaner<T, E, K> {
@@ -84,8 +85,10 @@ impl<T, E, K: Eq + Hash> Drop for UseQueryCleaner<T, E, K> {
             // Remove this listener
             query_listeners.listeners.remove(&self.scope_id);
 
+            let is_stale = query_listeners.value.borrow().is_stale(self.stale_time);
+
             // Clear the queries registry of this listener if it was the last one
-            if query_listeners.listeners.is_empty() {
+            if query_listeners.listeners.is_empty() && is_stale {
                 queries_registry.remove(&self.registry_entry);
             }
         });
@@ -141,7 +144,7 @@ pub fn use_query<T, E, K, const N: usize>(
     query: impl FnOnce() -> Query<T, E, K>,
 ) -> UseQuery<T, E, K>
 where
-    T: 'static + PartialEq,
+    T: 'static,
     E: 'static,
     K: 'static + Eq + Hash + Clone,
 {
@@ -177,7 +180,7 @@ where
 
             // Asynchronously initialize the query value
             spawn({
-                to_owned![registry_entry];
+                to_owned![registry_entry, stale_time];
                 async move {
                     client.run_new_query(&registry_entry, stale_time).await;
                 }
@@ -191,6 +194,7 @@ where
                     client,
                     registry_entry,
                     scope_id: current_scope_id().unwrap(),
+                    stale_time,
                 }),
             }
         })
@@ -249,7 +253,7 @@ pub fn use_get_query<T, E, K, Q, F, const N: usize>(
     query_fn: Q,
 ) -> UseQuery<T, E, K>
 where
-    T: 'static + PartialEq,
+    T: 'static,
     E: 'static,
     K: 'static + Eq + Hash + Clone,
     Q: 'static + Fn(Vec<K>) -> F,

src/use_query_client.rs

@@ -103,14 +103,14 @@ where
             listeners,
         } = self.get_entry(entry);
 
-        let is_fresh = value.borrow().is_fresh(stale_time);
+        let is_stale = value.borrow().is_stale(stale_time);
         let is_loading = value.borrow().is_loading();
-        let has_been_queried = value.borrow().has_been_loaded();
+        let has_been_loaded = value.borrow().has_been_loaded();
 
-        if (!is_fresh && !is_loading) || !has_been_queried {
+        if (is_stale && !is_loading) || !has_been_loaded {
             // If the query still has its initial state because it hasn't been loaded yet
             // we don't need to mark the value as loading, it would be an unnecesssary notification.
-            if has_been_queried {
+            if has_been_loaded {
                 value.borrow_mut().set_to_loading();
                 for listener in listeners {
                     (self.scheduler.peek())(listener);
@@ -128,6 +128,8 @@ where
             for listener in listeners {
                 (self.scheduler.peek())(listener);
             }
+
+            value.borrow_mut().set_to_loaded();
         }
     }