perf(router): prevent initializaing page twice

ionic-team · Sep 6, 2018 · 3dd9604 · 3dd9604
1 parent fc87875
commit 3dd9604
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/core/src/components/route-redirect/route-redirect.tsx b/core/src/components/route-redirect/route-redirect.tsx
@@ -1,4 +1,4 @@
-import { Component, Event, EventEmitter, Prop } from '@stencil/core';
+import { Component, Event, EventEmitter, Prop, Watch } from '@stencil/core';
 
 @Component({
   tag: 'ion-route-redirect'
@@ -39,13 +39,16 @@ export class RouteRedirect {
    */
   @Event() ionRouteRedirectChanged!: EventEmitter;
 
-  componentDidLoad() {
+  @Watch('from')
+  @Watch('to')
+  propDidChange() {
     this.ionRouteRedirectChanged.emit();
   }
-  componentDidUnload() {
+
+  componentDidLoad() {
     this.ionRouteRedirectChanged.emit();
   }
-  componentDidUpdate() {
+  componentDidUnload() {
     this.ionRouteRedirectChanged.emit();
   }
 }
diff --git a/core/src/components/router/router.tsx b/core/src/components/router/router.tsx
@@ -66,10 +66,11 @@ export class Router {
     console.debug('[ion-router] found nav');
 
     await this.onRoutesChanged();
+  }
 
+  componentDidLoad() {
     this.win.addEventListener('ionRouteRedirectChanged', debounce(this.onRedirectChanged.bind(this), 10));
     this.win.addEventListener('ionRouteDataChanged', debounce(this.onRoutesChanged.bind(this), 100));
-    this.onRedirectChanged();
   }
 
   @Listen('window:popstate')