fix: Fixed a bug that prevented ScopedQuery from detecting Ref updates.

mathrunet · Jul 14, 2023 · a7f9b88 · a7f9b88
1 parent 2620119
commit a7f9b88
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 3 deletions.
diff --git a/packages/katana_scoped/lib/value/cache.dart b/packages/katana_scoped/lib/value/cache.dart
@@ -104,7 +104,7 @@ class _CacheValueState<T> extends ScopedValueState<T, _CacheValue<T>> {
     _value = value.callback();
     final ref = value.ref;
     if (ref is ListenableRef) {
-      ref.addListener(_handledOnUpdateRef);
+      ref.addListener(_handledOnUpdateByRef);
     }
   }
 
@@ -116,7 +116,7 @@ class _CacheValueState<T> extends ScopedValueState<T, _CacheValue<T>> {
     }
   }
 
-  void _handledOnUpdateRef() {
+  void _handledOnUpdateByRef() {
     _value = value.callback();
     setState(() {});
   }
@@ -126,7 +126,7 @@ class _CacheValueState<T> extends ScopedValueState<T, _CacheValue<T>> {
     super.dispose();
     final ref = value.ref;
     if (ref is ListenableRef) {
-      ref.removeListener(_handledOnUpdateRef);
+      ref.removeListener(_handledOnUpdateByRef);
     }
   }
 

diff --git a/packages/katana_scoped/lib/value/query.dart b/packages/katana_scoped/lib/value/query.dart
@@ -36,6 +36,8 @@ extension RefQueryExtensions on Ref {
     return getScopedValue<T, _QueryValue<T>>(
       (ref) => _QueryValue<T>(
         callback: query.call(ref),
+        ref: ref,
+        listen: query.listen,
         autoDisposeWhenUnreferenced: query.autoDisposeWhenUnreferenced,
       ),
       listen: query.listen,
@@ -85,10 +87,14 @@ extension RefHasAppQueryExtensions on RefHasApp {
 class _QueryValue<T> extends ScopedValue<T> {
   const _QueryValue({
     required this.callback,
+    required this.ref,
+    this.listen = false,
     this.autoDisposeWhenUnreferenced = false,
   });
 
   final T Function() callback;
+  final bool listen;
+  final Ref ref;
   final bool autoDisposeWhenUnreferenced;
 
   @override
@@ -111,12 +117,23 @@ class _QueryValueState<T> extends ScopedValueState<T, _QueryValue<T>> {
     if (val is Listenable) {
       val.addListener(_handledOnUpdate);
     }
+    if (!value.listen) {
+      final ref = value.ref;
+      if (ref is ListenableRef) {
+        ref.addListener(_handledOnUpdateByRef);
+      }
+    }
   }
 
   void _handledOnUpdate() {
     setState(() {});
   }
 
+  void _handledOnUpdateByRef() {
+    _value = value.callback.call();
+    setState(() {});
+  }
+
   @override
   void dispose() {
     super.dispose();
@@ -127,6 +144,10 @@ class _QueryValueState<T> extends ScopedValueState<T, _QueryValue<T>> {
         val.dispose();
       }
     }
+    final ref = value.ref;
+    if (ref is ListenableRef) {
+      ref.removeListener(_handledOnUpdateByRef);
+    }
   }
 
   @override