@koordinates/xstate-tree 2.0.1 → 2.0.3

package/lib/routing/handleLocationChange/handleLocationChange.js

@@ -30,18 +30,14 @@ export function handleLocationChange(routes, basePath, path, search, setActiveRo
             route = route.parent;
         }
         setActiveRouteEvents([...routingEvents, match.event]);
-        // Bumps the processing for the state machines to the next event tick
-        // and out of the popstate handler
-        setTimeout(() => {
-            while (routingEvents.length > 0) {
-                const event = routingEvents.pop();
-                // copy the originalUrl to all parent events
-                event.originalUrl = match.event.originalUrl;
-                // @ts-ignore the event won't match GlobalEvents
-                broadcast(event);
-            }
+        while (routingEvents.length > 0) {
+            const event = routingEvents.pop();
+            // copy the originalUrl to all parent events
+            event.originalUrl = match.event.originalUrl;
             // @ts-ignore the event won't match GlobalEvents
-            broadcast(matchedEvent);
-        }, 0);
+            broadcast(event);
+        }
+        // @ts-ignore the event won't match GlobalEvents
+        broadcast(matchedEvent);
     }
 }

package/lib/routing/providers.js

@@ -8,11 +8,12 @@ function useRoutingContext() {
     return context;
 }
 export function useActiveRouteEvents() {
+    var _a;
     try {
         const context = useRoutingContext();
-        return context.activeRouteEvents;
+        return (_a = context.activeRouteEvents) === null || _a === void 0 ? void 0 : _a.current;
     }
-    catch (_a) {
+    catch (_b) {
         return undefined;
     }
 }

package/lib/xstateTree.js

@@ -149,8 +149,11 @@ export function buildRootComponent(machine, routing) {
     }
     const RootComponent = function XstateTreeRootComponent() {
         const [_, __, interpreter] = useMachine(machine, { devTools: true });
-        const [activeRouteEvents, setActiveRouteEvents] = useState(undefined);
+        const activeRouteEventsRef = useRef([]);
         const [forceRenderValue, forceRender] = useState(false);
+        const setActiveRouteEvents = (events) => {
+            activeRouteEventsRef.current = events;
+        };
         useEffect(() => {
             function handler(event) {
                 recursivelySend(interpreter, event);
@@ -188,9 +191,9 @@ export function buildRootComponent(machine, routing) {
                 return null;
             }
             return {
-                activeRouteEvents,
+                activeRouteEvents: activeRouteEventsRef,
             };
-        }, [activeRouteEvents]);
+        }, []);
         if (!interpreter.initialized) {
             setTimeout(() => forceRender(!forceRenderValue), 0);
             return null;

package/package.json

@@ -2,7 +2,7 @@
   "name": "@koordinates/xstate-tree",
   "main": "lib/index.js",
   "types": "lib/xstate-tree.d.ts",
-  "version": "2.0.1",
+  "version": "2.0.3",
   "dependencies": {
     "@xstate/react": "3.0.0",
     "fast-memoize": "2.5.2",