Fixing #262 - Signal/Computed should override value and not trigger c…

…allback
rodydavis · May 8, 2024 · 2fe3c7b · 2fe3c7b
1 parent cd1711f
commit 2fe3c7b
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 34 deletions.
diff --git a/packages/signals_core/lib/src/core/computed.dart b/packages/signals_core/lib/src/core/computed.dart
@@ -356,7 +356,7 @@ class Computed<T> extends ReadonlySignal<T> implements SignalListenable {
   @override
   late T _value;
 
-  final ComputedCallback<T> _fn;
+  ComputedCallback<T> _fn;
 
   @override
   _Node? _sources;
@@ -386,8 +386,12 @@ class Computed<T> extends ReadonlySignal<T> implements SignalListenable {
   /// // Override the signal with a new value
   /// counter = counter.overrideWith(1);
   /// ```
-  Computed<T> overrideWith(T value) {
-    this._reset(value);
+  Computed<T> overrideWith(T val) {
+    _fn = () => val;
+    _flags = _OUTDATED;
+    // _version = 0;
+    _initialValue = val;
+    _previousValue = null;
     return this;
   }
 
@@ -535,15 +539,6 @@ class Computed<T> extends ReadonlySignal<T> implements SignalListenable {
     _flags |= _DISPOSED;
   }
 
-  void _reset(T? value) {
-    _refresh();
-    if (value != null) {
-      _value = value;
-      _initialValue = value;
-      _previousValue = null;
-    }
-  }
-
   @override
   T get initialValue => _initialValue;
   late T _initialValue;

diff --git a/packages/signals_core/lib/src/core/signal.dart b/packages/signals_core/lib/src/core/signal.dart
@@ -301,15 +301,6 @@ class Signal<T> extends ReadonlySignal<T> {
     return _value;
   }
 
-  void _reset(T? value) {
-    if (value != null) {
-      _value = value;
-      _initialValue = value;
-      _previousValue = null;
-    }
-    _version = 0;
-  }
-
   /// Returns a readonly signal
   ReadonlySignal<T> readonly() => this;
 
@@ -323,8 +314,10 @@ class Signal<T> extends ReadonlySignal<T> {
   /// // Override the signal with a new value
   /// counter = counter.overrideWith(1);
   /// ```
-  Signal<T> overrideWith(T value) {
-    this._reset(value);
+  Signal<T> overrideWith(T val) {
+    _version = 0;
+    _value = val;
+    _previousValue = null;
     return this;
   }
 }

diff --git a/packages/signals_core/test/core/computed_test.dart b/packages/signals_core/test/core/computed_test.dart
@@ -93,12 +93,16 @@ void main() {
     });
 
     test('overrideWith', () {
-      final a = signal(1);
-      final b = signal(2);
-      final c = computed(() => a() + b());
-      expect(c.value, 3);
-      c.overrideWith(10);
-      expect(c.value, 10);
+      int calls = 0;
+      var c = computed(() {
+        calls++;
+        return 1;
+      });
+
+      c.overrideWith(2);
+
+      expect(c.value, 2);
+      expect(calls, 0);
     });
 
     test('test as stream', () {
@@ -113,18 +117,32 @@ void main() {
       expect(stream, emitsInOrder([0, 1, 2, 3]));
     });
 
-    test('test override', () {
-      final a = signal(0);
-      final s = computed(() => a()).overrideWith(-1);
+    test('test override subscribe', () {
+      final a = signal(1);
 
-      final stream = s.toStream();
+      int calls = 0;
+      List<int> results = [];
+      var c = computed(() {
+        calls++;
+        return a();
+      });
+
+      c.overrideWith(2);
+
+      expect(results, []);
+      expect(calls, 0);
+
+      final dispose = c.subscribe(results.add);
 
       a.value = 1;
       a.value = 2;
       a.value = 2; // check if skipped
       a.value = 3;
 
-      expect(stream, emitsInOrder([-1, 1, 2, 3]));
+      expect(calls, 0);
+      expect(results, [2]);
+
+      dispose();
     });
 
     test('should respect force set', () {