Merge pull request #525 from preactjs/bugfix-router-swapping

[preact-iso] Bugfix for swapping suspended routes
preactjs · Apr 2, 2021 · 79a1c7f · 79a1c7f
2 parents 19bb41c + da714fc
commit 79a1c7f
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/packages/preact-iso/router.js b/packages/preact-iso/router.js
@@ -135,7 +135,8 @@ export function Router(props) {
 		} else commit();
 	}, [url]);
 
-	return [prevChildren.current, curChildren.current];
+	// Note: curChildren must render first in order to populate pending.current
+	return [curChildren.current, prevChildren.current];
 }
 
 function Committer({ pending, children }) {
@@ -144,7 +145,9 @@ function Committer({ pending, children }) {
 
 Router.Provider = LocationProvider;
 
-LocationProvider.ctx = createContext(/** @type {{ url: string, path: string, query: object, route }} */ ({}));
+/** @typedef {{ url: string, path: string, query: object, route, wasPush: boolean }} RouteInfo */
+
+LocationProvider.ctx = createContext(/** @type {RouteInfo} */ ({}));
 const RouteContext = createContext({});
 
 export const Route = props => h(props.component, props);