fix(overmind): make sure derived clears existing tracking correctly

Author: christianalfoni

packages/node_modules/overmind/src/derived.ts

@@ -94,9 +94,9 @@ export class Derived {
       this.isDirty = false
       this.paths = getPaths()
 
-      // We add the paths to the derived
-      this.trackStateTree.pathDependencies.clear()
+      this.trackStateTree.clearTracking()
 
+      // We add the paths tracked to the derived
       for (let path of this.paths) {
         this.trackStateTree.addTrackingPath(path)
       }

packages/node_modules/proxy-state-tree/src/TrackStateTree.ts

@@ -52,13 +52,7 @@ export class TrackStateTree<T extends object> implements ITrackStateTree<T> {
     this.master.changeTrackStateTree(this)
     this.shouldTrack = true
 
-    if (this.callback) {
-      for (let path of this.pathDependencies) {
-        this.master.removePathDependency(path, this.callback)
-      }
-    }
-
-    this.pathDependencies.clear()
+    this.clearTracking()
 
     if (cb) {
       this.callback = (...args) => {
@@ -71,6 +65,15 @@ export class TrackStateTree<T extends object> implements ITrackStateTree<T> {
 
     return this
   }
+  clearTracking() {
+    if (this.callback) {
+      for (let path of this.pathDependencies) {
+        this.master.removePathDependency(path, this.callback)
+      }
+    }
+
+    this.pathDependencies.clear()
+  }
   stopTracking() {
     this.shouldTrack = false
   }
@@ -92,11 +95,7 @@ export class TrackStateTree<T extends object> implements ITrackStateTree<T> {
       return this
     }
 
-    for (let path of this.pathDependencies) {
-      this.master.removePathDependency(path, this.callback)
-    }
-
-    this.pathDependencies.clear()
+    this.clearTracking()
     this.callback = null
     this.proxifier = this.master.proxifier
 

packages/node_modules/proxy-state-tree/src/types.ts

@@ -59,6 +59,7 @@ export interface ITrackStateTree<T extends object> {
   canTrack(): boolean
   canMutate(): boolean
   dispose(): ITrackStateTree<T>
+  clearTracking(): void
   master: IProxyStateTree<T>
   shouldTrack: boolean
   proxifier: IProxifier<T>