fix(overmind-react): correctly track updates

Author: christianalfoni

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

@@ -83,7 +83,7 @@ export const createHook = <Config extends IConfiguration>(
       : {}
   }
   const useForceRerender = () => {
-    const [, setState] = useState(() => true)
+    const [flushId, setState] = useState(() => -1)
     const mountedRef = useRef(true)
 
     useEffect(
@@ -98,7 +98,10 @@ export const createHook = <Config extends IConfiguration>(
         setState(flushId)
       }
     }
-    return forceRerender
+    return {
+      forceRerender,
+      flushId,
+    }
   }
 
   return () => {
@@ -125,9 +128,7 @@ export const createHook = <Config extends IConfiguration>(
     )
 
     if (IS_PRODUCTION) {
-      const rerenderComponent = useForceRerender()
-
-      tree.track(rerenderComponent)
+      const { forceRerender } = useForceRerender()
 
       useEffect(
         () => () => {
@@ -137,6 +138,8 @@ export const createHook = <Config extends IConfiguration>(
       )
 
       useLayoutEffect(() => tree.stopTracking())
+
+      tree.track(forceRerender)
     } else {
       const component = useCurrentComponent()
       const name = component.name
@@ -149,22 +152,9 @@ export const createHook = <Config extends IConfiguration>(
         currentComponentInstanceId++
       )
 
-      const rerenderComponent = useForceRerender()
-
-      tree.track((_, __, flushId) => {
-        rerenderComponent(_, __, flushId)
-        overmind.eventHub.emitAsync(EventType.COMPONENT_UPDATE, {
-          componentId: component.__componentId,
-          componentInstanceId,
-          name,
-          flushId,
-          paths: Array.from(tree.pathDependencies) as any,
-        })
-      })
-
-      useLayoutEffect(() => tree.stopTracking())
+      const { flushId, forceRerender } = useForceRerender()
 
-      useEffect(() => {
+      useLayoutEffect(() => {
         overmind.eventHub.emitAsync(EventType.COMPONENT_ADD, {
           componentId: component.__componentId,
           componentInstanceId,
@@ -181,6 +171,18 @@ export const createHook = <Config extends IConfiguration>(
           })
         }
       }, [])
+
+      useLayoutEffect(() => {
+        tree.stopTracking()
+        overmind.eventHub.emitAsync(EventType.COMPONENT_UPDATE, {
+          componentId: component.__componentId,
+          componentInstanceId,
+          name,
+          flushId,
+          paths: Array.from(tree.pathDependencies) as any,
+        })
+      })
+      tree.track(forceRerender)
     }
 
     return {