refactor(nav): remove nav-push, nav-pop nav-root

angular/src/directives/proxies-list.txt

@@ -44,9 +44,6 @@ d.IonApp,
   d.IonMenuToggle,
   d.IonNav,
   d.IonNavLink,
-  d.IonNavPop,
-  d.IonNavPush,
-  d.IonNavSetRoot,
   d.IonNote,
   d.IonProgressBar,
   d.IonRadio,

angular/src/directives/proxies.ts

@@ -517,38 +517,6 @@ export class IonNavLink {
 }
 proxyInputs(IonNavLink, ['component', 'componentProps', 'routerDirection']);
 
-export declare interface IonNavPop extends Components.IonNavPop {}
-@Component({ selector: 'ion-nav-pop', changeDetection: ChangeDetectionStrategy.OnPush, template: '<ng-content></ng-content>' })
-export class IonNavPop {
-  protected el: HTMLElement;
-  constructor(c: ChangeDetectorRef, r: ElementRef, protected z: NgZone) {
-    c.detach();
-    this.el = r.nativeElement;
-  }
-}
-
-export declare interface IonNavPush extends Components.IonNavPush {}
-@Component({ selector: 'ion-nav-push', changeDetection: ChangeDetectionStrategy.OnPush, template: '<ng-content></ng-content>', inputs: ['component', 'componentProps'] })
-export class IonNavPush {
-  protected el: HTMLElement;
-  constructor(c: ChangeDetectorRef, r: ElementRef, protected z: NgZone) {
-    c.detach();
-    this.el = r.nativeElement;
-  }
-}
-proxyInputs(IonNavPush, ['component', 'componentProps']);
-
-export declare interface IonNavSetRoot extends Components.IonNavSetRoot {}
-@Component({ selector: 'ion-nav-set-root', changeDetection: ChangeDetectionStrategy.OnPush, template: '<ng-content></ng-content>', inputs: ['component', 'componentProps'] })
-export class IonNavSetRoot {
-  protected el: HTMLElement;
-  constructor(c: ChangeDetectorRef, r: ElementRef, protected z: NgZone) {
-    c.detach();
-    this.el = r.nativeElement;
-  }
-}
-proxyInputs(IonNavSetRoot, ['component', 'componentProps']);
-
 export declare interface IonNote extends Components.IonNote {}
 @Component({ selector: 'ion-note', changeDetection: ChangeDetectionStrategy.OnPush, template: '<ng-content></ng-content>', inputs: ['color', 'mode'] })
 export class IonNote {

angular/src/ionic-module.ts

@@ -14,7 +14,7 @@ import { IonRouterOutlet } from './directives/navigation/ion-router-outlet';
 import { IonTabs } from './directives/navigation/ion-tabs';
 import { NavDelegate } from './directives/navigation/nav-delegate';
 import { RouterLinkDelegate } from './directives/navigation/router-link-delegate';
-import { IonApp, IonAvatar, IonBackButton, IonBackdrop, IonBadge, IonButton, IonButtons, IonCard, IonCardContent, IonCardHeader, IonCardSubtitle, IonCardTitle, IonCheckbox, IonChip, IonCol, IonContent, IonDatetime, IonFab, IonFabButton, IonFabList, IonFooter, IonGrid, IonHeader, IonIcon, IonImg, IonInfiniteScroll, IonInfiniteScrollContent, IonInput, IonItem, IonItemDivider, IonItemGroup, IonItemOption, IonItemOptions, IonItemSliding, IonLabel, IonList, IonListHeader, IonMenu, IonMenuButton, IonMenuToggle, IonNav, IonNavLink, IonNavPop, IonNavPush, IonNavSetRoot, IonNote, IonProgressBar, IonRadio, IonRadioGroup, IonRange, IonRefresher, IonRefresherContent, IonReorder, IonReorderGroup, IonRippleEffect, IonRow, IonSearchbar, IonSegment, IonSegmentButton, IonSelect, IonSelectOption, IonSkeletonText, IonSlide, IonSlides, IonSpinner, IonSplitPane, IonTabBar, IonTabButton, IonText, IonTextarea, IonThumbnail, IonTitle, IonToggle, IonToolbar } from './directives/proxies';
+import { IonApp, IonAvatar, IonBackButton, IonBackdrop, IonBadge, IonButton, IonButtons, IonCard, IonCardContent, IonCardHeader, IonCardSubtitle, IonCardTitle, IonCheckbox, IonChip, IonCol, IonContent, IonDatetime, IonFab, IonFabButton, IonFabList, IonFooter, IonGrid, IonHeader, IonIcon, IonImg, IonInfiniteScroll, IonInfiniteScrollContent, IonInput, IonItem, IonItemDivider, IonItemGroup, IonItemOption, IonItemOptions, IonItemSliding, IonLabel, IonList, IonListHeader, IonMenu, IonMenuButton, IonMenuToggle, IonNav, IonNavLink, IonNote, IonProgressBar, IonRadio, IonRadioGroup, IonRange, IonRefresher, IonRefresherContent, IonReorder, IonReorderGroup, IonRippleEffect, IonRow, IonSearchbar, IonSegment, IonSegmentButton, IonSelect, IonSelectOption, IonSkeletonText, IonSlide, IonSlides, IonSpinner, IonSplitPane, IonTabBar, IonTabButton, IonText, IonTextarea, IonThumbnail, IonTitle, IonToggle, IonToolbar } from './directives/proxies';
 import { VirtualFooter } from './directives/virtual-scroll/virtual-footer';
 import { VirtualHeader } from './directives/virtual-scroll/virtual-header';
 import { VirtualItem } from './directives/virtual-scroll/virtual-item';
@@ -68,9 +68,6 @@ const DECLARATIONS = [
   IonMenuToggle,
   IonNav,
   IonNavLink,
-  IonNavPop,
-  IonNavPush,
-  IonNavSetRoot,
   IonNote,
   IonProgressBar,
   IonRadio,

core/api.txt

@@ -736,16 +736,6 @@ ion-nav-link,prop,component,Function | HTMLElement | ViewController | null | str
 ion-nav-link,prop,componentProps,undefined | { [key: string]: any; },undefined,false,false
 ion-nav-link,prop,routerDirection,"back" | "forward" | "root",'forward',false,false
 
-ion-nav-pop,none
-
-ion-nav-push,none
-ion-nav-push,prop,component,Function | HTMLElement | ViewController | null | string | undefined,undefined,false,false
-ion-nav-push,prop,componentProps,undefined | { [key: string]: any; },undefined,false,false
-
-ion-nav-set-root,none
-ion-nav-set-root,prop,component,Function | HTMLElement | ViewController | null | string | undefined,undefined,false,false
-ion-nav-set-root,prop,componentProps,undefined | { [key: string]: any; },undefined,false,false
-
 ion-note,shadow
 ion-note,prop,color,string | undefined,undefined,false,false
 ion-note,prop,mode,"ios" | "md",undefined,false,false

core/src/components.d.ts

@@ -1662,27 +1662,6 @@ export namespace Components {
     */
     'routerDirection': RouterDirection;
   }
-  interface IonNavPop {}
-  interface IonNavPush {
-    /**
-    * Component to navigate to
-    */
-    'component'?: NavComponent;
-    /**
-    * Data you want to pass to the component as props
-    */
-    'componentProps'?: ComponentProps;
-  }
-  interface IonNavSetRoot {
-    /**
-    * Component you want to make root for the navigation stack
-    */
-    'component'?: NavComponent;
-    /**
-    * Data you want to pass to the component as props
-    */
-    'componentProps'?: ComponentProps;
-  }
   interface IonNote {
     /**
     * The color to use from your application's color palette. Default options are: `"primary"`, `"secondary"`, `"tertiary"`, `"success"`, `"warning"`, `"danger"`, `"light"`, `"medium"`, and `"dark"`. For more information on colors, see [theming](/docs/theming/basics).
@@ -3215,24 +3194,6 @@ declare global {
     new (): HTMLIonNavLinkElement;
   };
 
-  interface HTMLIonNavPopElement extends Components.IonNavPop, HTMLStencilElement {}
-  var HTMLIonNavPopElement: {
-    prototype: HTMLIonNavPopElement;
-    new (): HTMLIonNavPopElement;
-  };
-
-  interface HTMLIonNavPushElement extends Components.IonNavPush, HTMLStencilElement {}
-  var HTMLIonNavPushElement: {
-    prototype: HTMLIonNavPushElement;
-    new (): HTMLIonNavPushElement;
-  };
-
-  interface HTMLIonNavSetRootElement extends Components.IonNavSetRoot, HTMLStencilElement {}
-  var HTMLIonNavSetRootElement: {
-    prototype: HTMLIonNavSetRootElement;
-    new (): HTMLIonNavSetRootElement;
-  };
-
   interface HTMLIonNoteElement extends Components.IonNote, HTMLStencilElement {}
   var HTMLIonNoteElement: {
     prototype: HTMLIonNoteElement;
@@ -3554,9 +3515,6 @@ declare global {
     'ion-modal-controller': HTMLIonModalControllerElement;
     'ion-nav': HTMLIonNavElement;
     'ion-nav-link': HTMLIonNavLinkElement;
-    'ion-nav-pop': HTMLIonNavPopElement;
-    'ion-nav-push': HTMLIonNavPushElement;
-    'ion-nav-set-root': HTMLIonNavSetRootElement;
     'ion-note': HTMLIonNoteElement;
     'ion-picker': HTMLIonPickerElement;
     'ion-picker-column': HTMLIonPickerColumnElement;
@@ -4984,27 +4942,6 @@ declare namespace LocalJSX {
     */
     'routerDirection'?: RouterDirection;
   }
-  interface IonNavPop {}
-  interface IonNavPush {
-    /**
-    * Component to navigate to
-    */
-    'component'?: NavComponent;
-    /**
-    * Data you want to pass to the component as props
-    */
-    'componentProps'?: ComponentProps;
-  }
-  interface IonNavSetRoot {
-    /**
-    * Component you want to make root for the navigation stack
-    */
-    'component'?: NavComponent;
-    /**
-    * Data you want to pass to the component as props
-    */
-    'componentProps'?: ComponentProps;
-  }
   interface IonNote {
     /**
     * The color to use from your application's color palette. Default options are: `"primary"`, `"secondary"`, `"tertiary"`, `"success"`, `"warning"`, `"danger"`, `"light"`, `"medium"`, and `"dark"`. For more information on colors, see [theming](/docs/theming/basics).
@@ -6253,9 +6190,6 @@ declare namespace LocalJSX {
     'ion-modal-controller': IonModalController;
     'ion-nav': IonNav;
     'ion-nav-link': IonNavLink;
-    'ion-nav-pop': IonNavPop;
-    'ion-nav-push': IonNavPush;
-    'ion-nav-set-root': IonNavSetRoot;
     'ion-note': IonNote;
     'ion-picker': IonPicker;
     'ion-picker-column': IonPickerColumn;
@@ -6361,9 +6295,6 @@ declare module "@stencil/core" {
       'ion-modal-controller': LocalJSX.IonModalController & JSXBase.HTMLAttributes<HTMLIonModalControllerElement>;
       'ion-nav': LocalJSX.IonNav & JSXBase.HTMLAttributes<HTMLIonNavElement>;
       'ion-nav-link': LocalJSX.IonNavLink & JSXBase.HTMLAttributes<HTMLIonNavLinkElement>;
-      'ion-nav-pop': LocalJSX.IonNavPop & JSXBase.HTMLAttributes<HTMLIonNavPopElement>;
-      'ion-nav-push': LocalJSX.IonNavPush & JSXBase.HTMLAttributes<HTMLIonNavPushElement>;
-      'ion-nav-set-root': LocalJSX.IonNavSetRoot & JSXBase.HTMLAttributes<HTMLIonNavSetRootElement>;
       'ion-note': LocalJSX.IonNote & JSXBase.HTMLAttributes<HTMLIonNoteElement>;
       'ion-picker': LocalJSX.IonPicker & JSXBase.HTMLAttributes<HTMLIonPickerElement>;
       'ion-picker-column': LocalJSX.IonPickerColumn & JSXBase.HTMLAttributes<HTMLIonPickerColumnElement>;

core/src/components/back-button/test/host-element/index.html

@@ -24,9 +24,9 @@
             </ion-header>
             <ion-content class="ion-padding">
               <h1>Page One</h1>
-              <ion-nav-push component="page-two">
+              <ion-nav-link router-direction="forward" component="page-two">
                 <ion-button class="next">Go to Page Two</ion-button>
-              </ion-nav-push>
+              </ion-nav-link>
             </ion-content>
         `;
       }
@@ -47,9 +47,9 @@ <h1>Page One</h1>
             <ion-content class="ion-padding">
               <h1>Page Two</h1>
               <div>
-                <ion-nav-push component="page-three">
+                <ion-nav-link router-direction="forward" component="page-three">
                   <ion-button class="next">Go to Page Three</ion-button>
-                </ion-nav-push>
+                </ion-nav-link>
               </div>
             </ion-content>
         `;
@@ -71,9 +71,9 @@ <h1>Page Two</h1>
             <ion-content class="ion-padding">
               <h1>Page Three</h1>
               <div>
-                <ion-nav-push component="page-four">
+                <ion-nav-link router-direction="forward" component="page-four">
                   <ion-button class="next">Go to Page Four</ion-button>
-                </ion-nav-push>
+                </ion-nav-link>
               </div>
             </ion-content>
         `;

core/src/components/nav-link/test/basic/index.html

@@ -44,9 +44,9 @@
         </ion-header>
         <ion-content class="ion-padding">
           <h1>Page One</h1>
-          <ion-nav-push component="page-two">
+          <ion-nav-link router-direction="forward" component="page-two">
             <ion-button class="next">Go to Page Two</ion-button>
-          </ion-nav-push>
+          </ion-nav-link>
         </ion-content>
       `;
     }
@@ -63,12 +63,12 @@ <h1>Page One</h1>
         </ion-header>
         <ion-content class="ion-padding">
           <h1>Page Two</h1>
-          <ion-nav-push component="page-three">
+          <ion-nav-link router-direction="forward" component="page-three">
             <ion-button class="next">Go to Page Three</ion-button>
-          </ion-nav-push>
-          <ion-nav-pop>
+          </ion-nav-link>
+          <ion-nav-link router-direction="back">
             <ion-button class="back">Go Back</ion-button>
-          </ion-nav-pop>
+          </ion-nav-link>
         </ion-content>
       `;
     }
@@ -85,9 +85,9 @@ <h1>Page Two</h1>
         </ion-header>
         <ion-content class="ion-padding">
           <h1>Page Three</h1>
-          <ion-nav-pop>
+          <ion-nav-link router-direction="back">
             <ion-button class="back">Go Back</ion-button>
-          </ion-nav-pop>
+          </ion-nav-link>
         </ion-content>
       `;
     }