fix(router): 修复ios9下不执行render的问题

NervJS · Mar 15, 2019 · 81cc636 · 81cc636
1 parent b520dfb
commit 81cc636
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/packages/taro-router/src/history/createHistory.ts b/packages/taro-router/src/history/createHistory.ts
@@ -217,7 +217,16 @@ const createHistory = (props: { basename?: string, mode: "hash" | "browser", fir
     listenerCount += delta
 
     if (listenerCount === 1) {
-      window.addEventListener(PopStateEvent, handlePopState)
+      const isSafari = /^((?!chrome).)*safari/i.test(navigator.userAgent)
+      if (isSafari) {
+        window.addEventListener('load', function() {
+          setTimeout(function() {
+            window.addEventListener(PopStateEvent, handlePopState)
+          }, 0);
+        });
+      } else {
+        window.addEventListener(PopStateEvent, handlePopState)
+      }
     } else if (listenerCount === 0) {
       window.removeEventListener(PopStateEvent, handlePopState)
     }

diff --git a/packages/taro-router/src/router/route.tsx b/packages/taro-router/src/router/route.tsx
@@ -46,10 +46,10 @@ class Route extends Component<RouteProps, {}> {
   }
 
   computeMatch (currentLocation) {
-    const pathname = currentLocation.pathname;
+    const path = currentLocation.path;
     const key = currentLocation.state.key;
     const isIndex = this.props.isIndex;
-    if (isIndex && pathname === '/') return true
+    if (isIndex && path === '/') return true
     return key === this.props.key
   }