fix: record history state before render (#140)

* fix: record history state before render * chore: typo
ice-lab · Jul 7, 2020 · 2acfa33 · 2acfa33
1 parent f3819df
commit 2acfa33
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ice/stark",
-  "version": "1.5.3",
+  "version": "1.5.4",
   "description": "Icestark is a JavaScript library for multiple projects, Ice workbench solution.",
   "scripts": {
     "build": "rm -rf lib && tsc",

diff --git a/src/AppRouter.tsx b/src/AppRouter.tsx
@@ -218,11 +218,11 @@ export default class AppRouter extends React.Component<AppRouterProps, AppRouter
     // if AppRouter is unmounted, cancel all operations
     if (this.unmounted) return;
 
-    this.setState({ url });
-
-    // setHistoryState after setState
-    // history in sub-application will not triggered callCapturedEventListeners for historyState is null
+    // setHistoryState before setState
+    // setState is only async batched when it is called inside a React event handler, otherwise it is sync
+    // make sure history state had beed recorded before render
     setHistoryState(state);
+    this.setState({ url });
 
     this.handleRouteChange(url, routeType);
   };