fix(nav): adds public willLoad lifecycle event

manucorporat · adamdbradley · commit 033e1eae1743 · 2016-11-01T13:12:29.000-05:00
* fix(nav): adds public willLoad lifecycle event

* test(menu): adds more asserts
diff --git a/src/components/menu/menu.ts b/src/components/menu/menu.ts
@@ -2,7 +2,7 @@ import { ChangeDetectionStrategy, Component, ContentChild, ElementRef, EventEmit
 
 import { Backdrop } from '../backdrop/backdrop';
 import { Config } from '../../config/config';
-import { isTrueProperty } from '../../util/util';
+import { isTrueProperty, assert } from '../../util/util';
 import { Keyboard } from '../../util/keyboard';
 import { MenuContentGesture } from  './menu-gestures';
 import { MenuController } from './menu-controller';
@@ -192,7 +192,6 @@ export class Menu {
   private _cntEle: HTMLElement;
   private _cntGesture: MenuContentGesture;
   private _type: MenuType;
-  private _resizeUnreg: Function;
   private _isEnabled: boolean = true;
   private _isSwipeEnabled: boolean = true;
   private _isAnimating: boolean = false;
@@ -472,6 +471,8 @@ export class Menu {
   }
 
   private _before() {
+    assert(this._isAnimating === false, '_before should be called when we are not animating');
+
     // this places the menu into the correct location before it animates in
     // this css class doesn't actually kick off any animations
     this.menuContent && this.menuContent.resize();
@@ -482,6 +483,8 @@ export class Menu {
   }
 
   private _after(isOpen: boolean) {
+    assert(this._isAnimating === true, '_after should be called when we are animating');
+
     // keep opening/closing the menu disabled for a touch more yet
     // only add listeners/css if it's enabled and isOpen
     // and only remove listeners/css if it's not open
@@ -516,21 +519,21 @@ export class Menu {
   /**
    * @private
    */
-  open() {
+  open(): Promise<boolean> {
     return this.setOpen(true);
   }
 
   /**
    * @private
    */
-  close() {
+  close(): Promise<boolean> {
     return this.setOpen(false);
   }
 
   /**
    * @private
    */
-  toggle() {
+  toggle(): Promise<boolean> {
     return this.setOpen(!this.isOpen);
   }
 
@@ -633,12 +636,10 @@ export class Menu {
     this._events.unlistenAll();
     this._cntGesture && this._cntGesture.destroy();
     this._type && this._type.destroy();
-    this._resizeUnreg && this._resizeUnreg();
 
     this._cntGesture = null;
     this._type = null;
     this._cntEle = null;
-    this._resizeUnreg = null;
   }
 
 }
diff --git a/src/components/modal/modal-component.ts b/src/components/modal/modal-component.ts
@@ -30,7 +30,7 @@ export class ModalCmp {
     this._bdDismiss = _navParams.data.opts.enableBackdropDismiss;
   }
 
-  ionViewWillLoad() {
+  ionViewPreLoad() {
     this._load(this._navParams.data.component);
   }
 
diff --git a/src/components/modal/test/basic/app-module.ts b/src/components/modal/test/basic/app-module.ts
@@ -149,6 +149,7 @@ export class E2EPage {
       <button ion-button full (click)="submit()">Submit</button>
       <p>ionViewCanEnter ({{called.ionViewCanEnter}})</p>
       <p>ionViewCanLeave ({{called.ionViewCanLeave}})</p>
+      <p>ionViewWillLoad ({{called.ionViewWillLoad}})</p>
       <p>ionViewDidLoad ({{called.ionViewDidLoad}})</p>
       <p>ionViewWillEnter ({{called.ionViewWillEnter}})</p>
       <p>ionViewDidEnter ({{called.ionViewDidEnter}})</p>
@@ -178,6 +179,7 @@ export class ModalPassData {
     this.called = {
       ionViewCanEnter: 0,
       ionViewCanLeave: 0,
+      ionViewWillLoad: 0,
       ionViewDidLoad: 0,
       ionViewWillEnter: 0,
       ionViewDidEnter: 0,
@@ -213,6 +215,11 @@ export class ModalPassData {
     });
   }
 
+  ionViewWillLoad() {
+    console.log('ModalPassData ionViewWillLoad fired');
+    this.called.ionViewWillLoad++;
+  }
+
   ionViewDidLoad() {
     console.log('ModalPassData ionViewDidLoad fired');
     this.called.ionViewDidLoad++;
@@ -400,6 +407,7 @@ export class ContactUs {
     <ion-content padding>
       <p>ionViewCanEnter ({{called.ionViewCanEnter}})</p>
       <p>ionViewCanLeave ({{called.ionViewCanLeave}})</p>
+      <p>ionViewWillLoad ({{called.ionViewWillLoad}})</p>
       <p>ionViewDidLoad ({{called.ionViewDidLoad}})</p>
       <p>ionViewWillEnter ({{called.ionViewWillEnter}})</p>
       <p>ionViewDidEnter ({{called.ionViewDidEnter}})</p>
@@ -441,6 +449,7 @@ export class ModalFirstPage {
     this.called = {
       ionViewCanEnter: 0,
       ionViewCanLeave: 0,
+      ionViewWillLoad: 0,
       ionViewDidLoad: 0,
       ionViewWillEnter: 0,
       ionViewDidEnter: 0,
@@ -479,6 +488,11 @@ export class ModalFirstPage {
     return true;
   }
 
+  ionViewWillLoad() {
+    console.log('ModalFirstPage ionViewWillLoad fired');
+    this.called.ionViewWillLoad++;
+  }
+
   ionViewDidLoad() {
     console.log('ModalFirstPage ionViewDidLoad fired');
     this.called.ionViewDidLoad++;
diff --git a/src/components/nav/test/basic/app-module.ts b/src/components/nav/test/basic/app-module.ts
@@ -1,15 +1,22 @@
 import { NgModule, Component, ViewChild } from '@angular/core';
-import { App, AlertController, Content, DeepLinkConfig, IonicApp, IonicModule, Label, NavController, NavParams, Tabs, Tab, ModalController, ViewController } from '../../../..';
+import { App, AlertController, Content, DeepLinkConfig, IonicApp, IonicModule, NavController, NavParams, Tabs, Tab, ModalController, ViewController } from '../../../..';
+
+@Component({
+  selector: 'my-cmp2',
+  template: `<span style="color:green">{{value}}</span>`
+})
+export class MyCmpTest2 {
+  value: string = 'Test Failed';
+}
 
 @Component({
   selector: 'my-cmp',
-  template: `<ion-label>My Custom Component Test <ion-icon name="star"></ion-icon>
-  <span style="color:green">{{value}}</span></ion-label>`
+  template: `<my-cmp2></my-cmp2> <span style="color:green">{{value}}</span>`
 })
 export class MyCmpTest {
-  @ViewChild(Label) _label: Label;
-  label: Label;
-  value: string = '';
+  @ViewChild(MyCmpTest2) _label: MyCmpTest2;
+  label: MyCmpTest2;
+  value: string = 'Test Failed';
 
   ngOnInit() {
     this.label = this._label;
@@ -34,6 +41,7 @@ export class MyCmpTest {
       <div padding>
         <p>ionViewCanEnter ({{called.ionViewCanEnter}})</p>
         <p>ionViewCanLeave ({{called.ionViewCanLeave}})</p>
+        <p>ionViewWillLoad ({{called.ionViewWillLoad}})</p>
         <p>ionViewDidLoad ({{called.ionViewDidLoad}})</p>
         <p>ionViewWillEnter ({{called.ionViewWillEnter}})</p>
         <p>ionViewDidEnter ({{called.ionViewDidEnter}})</p>
@@ -91,6 +99,7 @@ export class FirstPage {
     this.called = {
       ionViewCanEnter: 0,
       ionViewCanLeave: 0,
+      ionViewWillLoad: 0,
       ionViewDidLoad: 0,
       ionViewWillEnter: 0,
       ionViewDidEnter: 0,
@@ -104,11 +113,11 @@ export class FirstPage {
     for (var i = 1; i <= 50; i++) {
       this.pages.push(i);
     }
-    // if (!this.myCmp || !this.content || !this.myCmp.label) {
-    //   throw new Error('children are not loaded');
-    // }
-    this.myCmp.value = 'root!';
-    // this.myCmp.label.color = 'primary';
+    if (!this.myCmp || !this.content || !this.myCmp.label) {
+      throw new Error('children are not loaded');
+    }
+    this.myCmp.value = '👍 self test passed!';
+    this.myCmp.label.value = '👍 children test passed!';
     this.called.ionViewDidLoad++;
   }
 
@@ -810,6 +819,7 @@ export const deepLinkConfig: DeepLinkConfig = {
     RedirectPage,
     AnotherPage,
     MyCmpTest,
+    MyCmpTest2,
     FullPage,
     PrimaryHeaderPage,
     TabsPage,
diff --git a/src/components/picker/picker-component.ts b/src/components/picker/picker-component.ts
@@ -423,7 +423,7 @@ export class PickerCmp {
     this.lastClick = 0;
   }
 
-  ionViewDidLoad() {
+  ionViewWillLoad() {
     // normalize the data
     let data = this.d;
 
diff --git a/src/components/popover/popover-component.ts b/src/components/popover/popover-component.ts
@@ -60,7 +60,7 @@ export class PopoverCmp {
     this.id = (++popoverIds);
   }
 
-  ionViewWillLoad() {
+  ionViewPreLoad() {
     let activeElement: any = document.activeElement;
     if (document.activeElement) {
       activeElement.blur();
diff --git a/src/components/tabs/test/lifecyles/app-module.ts b/src/components/tabs/test/lifecyles/app-module.ts
@@ -0,0 +1,129 @@
+import { Component, NgModule } from '@angular/core';
+import { IonicApp, IonicModule, NavController, AlertController } from '../../../..';
+
+//
+// Tab 1
+//
+@Component({
+  template: `
+    <ion-header>
+      <ion-navbar>
+        <ion-title>Lifecyles</ion-title>
+      </ion-navbar>
+    </ion-header>
+
+    <ion-content padding>
+      <p>ionViewCanEnter ({{called.ionViewCanEnter}})</p>
+      <p>ionViewCanLeave ({{called.ionViewCanLeave}})</p>
+      <p>ionViewWillLoad ({{called.ionViewWillLoad}})</p>
+      <p>ionViewDidLoad ({{called.ionViewDidLoad}})</p>
+      <p>ionViewWillEnter ({{called.ionViewWillEnter}})</p>
+      <p>ionViewDidEnter ({{called.ionViewDidEnter}})</p>
+      <p>ionViewWillLeave ({{called.ionViewWillLeave}})</p>
+      <p>ionViewDidLeave ({{called.ionViewDidLeave}})</p>
+
+      <button ion-button (click)="push()">push()</button>
+      <button ion-button (click)="openAlert()">open alert</button>
+    </ion-content>
+    `
+})
+export class Tab1 {
+  called: any;
+
+  constructor(private alertCtrl: AlertController, private navCtrl: NavController) {
+    this.called = {
+      ionViewCanEnter: 0,
+      ionViewCanLeave: 0,
+      ionViewWillLoad: 0,
+      ionViewDidLoad: 0,
+      ionViewWillEnter: 0,
+      ionViewDidEnter: 0,
+      ionViewWillLeave: 0,
+      ionViewDidLeave: 0
+    };
+  }
+
+  push() {
+    this.navCtrl.push(Tab1);
+  }
+
+  openAlert() {
+    this.alertCtrl.create({
+      title: 'Example'
+    }).present();
+  }
+
+  ionViewCanEnter() {
+    this.called.ionViewCanEnter++;
+    return true;
+  }
+
+  ionViewCanLeave() {
+    this.called.ionViewCanLeave++;
+    return true;
+  }
+
+  ionViewWillLoad() {
+    this.called.ionViewWillLoad++;
+  }
+
+  ionViewDidLoad() {
+    this.called.ionViewDidLoad++;
+  }
+
+  ionViewWillEnter() {
+    this.called.ionViewWillEnter++;
+  }
+
+  ionViewDidEnter() {
+    this.called.ionViewDidEnter++;
+  }
+
+  ionViewWillLeave() {
+    this.called.ionViewWillLeave++;
+  }
+
+  ionViewDidLeave() {
+    this.called.ionViewDidLeave++;
+  }
+}
+
+@Component({
+  template: `
+    <ion-tabs>
+      <ion-tab tabTitle="Plain List" tabIcon="star" [root]="root"></ion-tab>
+      <ion-tab tabTitle="Schedule" tabIcon="globe" [root]="root"></ion-tab>
+      <ion-tab tabTitle="Stopwatch" tabIcon="logo-facebook" [root]="root"></ion-tab>
+    </ion-tabs>
+  `
+})
+export class TabsPage {
+  root = Tab1;
+}
+
+@Component({
+  template: `<ion-nav [root]="root"></ion-nav>`
+})
+export class E2EApp {
+  root = TabsPage;
+}
+
+@NgModule({
+  declarations: [
+    E2EApp,
+    Tab1,
+    TabsPage
+  ],
+  imports: [
+    IonicModule.forRoot(E2EApp, {
+      tabsHighlight: true,
+    })
+  ],
+  bootstrap: [IonicApp],
+  entryComponents: [
+    E2EApp,
+    Tab1,
+    TabsPage
+  ]
+})
+export class AppModule {}
diff --git a/src/navigation/nav-controller-base.ts b/src/navigation/nav-controller-base.ts
diff --git a/src/navigation/view-controller.ts b/src/navigation/view-controller.ts

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ export class ModalCmp {`
`30`	`30`	`this._bdDismiss = _navParams.data.opts.enableBackdropDismiss;`
`31`	`31`	`}`
`32`	`32`
`33`		`- ionViewWillLoad() {`
	`33`	`+ ionViewPreLoad() {`
`34`	`34`	`this._load(this._navParams.data.component);`
`35`	`35`	`}`
`36`	`36`
Original file line number	Diff line number	Diff line change
`@@ -423,7 +423,7 @@ export class PickerCmp {`
`423`	`423`	`this.lastClick = 0;`
`424`	`424`	`}`
`425`	`425`
`426`		`- ionViewDidLoad() {`
	`426`	`+ ionViewWillLoad() {`
`427`	`427`	`// normalize the data`
`428`	`428`	`let data = this.d;`
`429`	`429`
Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ export class PopoverCmp {`
`60`	`60`	`this.id = (++popoverIds);`
`61`	`61`	`}`
`62`	`62`
`63`		`- ionViewWillLoad() {`
	`63`	`+ ionViewPreLoad() {`
`64`	`64`	`let activeElement: any = document.activeElement;`
`65`	`65`	`if (document.activeElement) {`
`66`	`66`	`activeElement.blur();`