Move navigation to machine

src/machines/authenticated.ts

@@ -1,7 +1,11 @@
-import { ActorRefFrom, setup, assign } from "xstate";
+import { ActorRefFrom, setup, assign, fromCallback } from "xstate";
 import { AuthenticatedParamList } from "../types/navigation";
 import { HomeMachineActor, homeMachine } from "./home";
 import { ListMachineActor, listMachine } from "./list";
+import {
+  getCurrentRouteName,
+  navigationRef,
+} from "../navigation/NavigationRef";
 
 export type AuthenticatedMachineActor = ActorRefFrom<
   typeof authenticatedMachine
@@ -27,7 +31,21 @@ export const authenticatedMachine = setup({
       },
     }),
   },
-  actors: { homeMachine, listMachine },
+  actors: {
+    homeMachine,
+    listMachine,
+    navigationSubscriber: fromCallback(({ sendBack }) => {
+      const unsubscribe = navigationRef.addListener("state", (_event) => {
+        const screenRoute = getCurrentRouteName();
+
+        if (screenRoute) {
+          sendBack({ type: "NAVIGATE", screen: screenRoute });
+        }
+      });
+
+      return unsubscribe;
+    }),
+  },
   guards: {
     isHomeScreen(_, params: { screen: keyof AuthenticatedParamList }) {
       return params.screen === "Home";
@@ -40,6 +58,7 @@ export const authenticatedMachine = setup({
   context: { refHome: undefined, refList: undefined },
   id: "application",
   initial: "homeScreen",
+  invoke: { src: "navigationSubscriber" },
   on: {
     NAVIGATE: [
       {

src/navigation/AuthenticatedNavigator.tsx

@@ -9,7 +9,6 @@ import {
 import { AuthenticatedMachineActor } from "../machines/authenticated";
 import HomeScreen from "../screens/Home";
 import ListScreen from "../screens/List";
-import { useNavigator } from "../hooks/useNavigator";
 
 const Stack = createNativeStackNavigator<AuthenticatedParamList>();
 
@@ -22,10 +21,6 @@ export function AuthenticatedNavigator({ actorRef }: Props) {
     return snapshot;
   });
 
-  useNavigator<AuthenticatedParamList>((route) => {
-    actorRef.send({ type: "NAVIGATE", screen: route });
-  });
-
   return (
     <Stack.Navigator initialRouteName="Home">
       <Stack.Screen name="Home">