fix(overmind-react): fix last component tracking

Author: christianalfoni

packages/node_modules/overmind-react/src/index.ts

@@ -94,6 +94,8 @@ export const createHook = <Config extends Configuration>(
         },
         []
       )
+
+      useLayoutEffect(() => tree.stopTracking())
     } else {
       const [componentInstanceId] = useState<any>(
         () => currentComponentInstanceId++
@@ -110,6 +112,8 @@ export const createHook = <Config extends Configuration>(
         })
       })
 
+      useLayoutEffect(() => tree.stopTracking())
+
       useEffect(() => {
         overmind.eventHub.emitAsync(EventType.COMPONENT_ADD, {
           componentId: component.__componentId,
@@ -158,9 +162,10 @@ export const createConnect = <A extends Overmind<Configuration>>(
     if (isClassComponent) {
       const originalRender = component.prototype.render
       component.prototype.render = function() {
-        this.props.overmind &&
-          this.props.overmind.tree.track(this.props.overmind.onUpdate)
-        return originalRender.call(this)
+        return this.props.overmind.tree.trackScope(
+          () => originalRender.call(this),
+          this.props.overmind.onUpdate
+        )
       }
     }
 
@@ -206,12 +211,17 @@ export const createConnect = <A extends Overmind<Configuration>>(
             } as any)
           }
 
-          this.tree.track(this.onUpdate)
-
-          return createElement(component, {
-            ...this.props,
-            overmind: this.state.overmind,
-          } as any)
+          return createElement(
+            (...args) =>
+              this.tree.trackScope(
+                () => (component as any)(...args),
+                this.onUpdate
+              ),
+            {
+              ...this.props,
+              overmind: this.state.overmind,
+            } as any
+          )
         }
       }
 
@@ -282,13 +292,17 @@ export const createConnect = <A extends Overmind<Configuration>>(
               overmind: this.state.overmind,
             } as any)
           }
-
-          this.tree.track(this.onUpdate)
-
-          return createElement(component, {
-            ...this.props,
-            overmind: this.state.overmind,
-          } as any)
+          return createElement(
+            (...args) =>
+              this.tree.trackScope(
+                () => (component as any)(...args),
+                this.onUpdate
+              ),
+            {
+              ...this.props,
+              overmind: this.state.overmind,
+            } as any
+          )
         }
       }