diff --git a/angular/src/directives/proxies-list.txt b/angular/src/directives/proxies-list.txt
index 443628c5c07..0f06d58842e 100644
--- a/angular/src/directives/proxies-list.txt
+++ b/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,
diff --git a/angular/src/directives/proxies.ts b/angular/src/directives/proxies.ts
index 482b67d795b..dc20dcccb07 100644
--- a/angular/src/directives/proxies.ts
+++ b/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: '' })
-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: '', 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: '', 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: '', inputs: ['color', 'mode'] })
export class IonNote {
diff --git a/angular/src/ionic-module.ts b/angular/src/ionic-module.ts
index 8260c3b861e..76663fd367a 100644
--- a/angular/src/ionic-module.ts
+++ b/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,
diff --git a/core/api.txt b/core/api.txt
index e3942917803..7a8f85db849 100644
--- a/core/api.txt
+++ b/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
diff --git a/core/src/components.d.ts b/core/src/components.d.ts
index 4cb9bd5d23c..d762d0d0d6b 100644
--- a/core/src/components.d.ts
+++ b/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;
'ion-nav': LocalJSX.IonNav & JSXBase.HTMLAttributes;
'ion-nav-link': LocalJSX.IonNavLink & JSXBase.HTMLAttributes;
- 'ion-nav-pop': LocalJSX.IonNavPop & JSXBase.HTMLAttributes;
- 'ion-nav-push': LocalJSX.IonNavPush & JSXBase.HTMLAttributes;
- 'ion-nav-set-root': LocalJSX.IonNavSetRoot & JSXBase.HTMLAttributes;
'ion-note': LocalJSX.IonNote & JSXBase.HTMLAttributes;
'ion-picker': LocalJSX.IonPicker & JSXBase.HTMLAttributes;
'ion-picker-column': LocalJSX.IonPickerColumn & JSXBase.HTMLAttributes;
diff --git a/core/src/components/back-button/test/host-element/index.html b/core/src/components/back-button/test/host-element/index.html
index 227d2527c28..9d42734cf0c 100644
--- a/core/src/components/back-button/test/host-element/index.html
+++ b/core/src/components/back-button/test/host-element/index.html
@@ -24,9 +24,9 @@
Page One
-
+
Go to Page Two
-
+
`;
}
@@ -47,9 +47,9 @@ Page One
Page Two
-
+
Go to Page Three
-
+
`;
@@ -71,9 +71,9 @@ Page Two
Page Three
-
+
Go to Page Four
-
+
`;
diff --git a/core/src/components/nav-link/test/basic/index.html b/core/src/components/nav-link/test/basic/index.html
index 5b8c6d88f14..b11833ca946 100644
--- a/core/src/components/nav-link/test/basic/index.html
+++ b/core/src/components/nav-link/test/basic/index.html
@@ -44,9 +44,9 @@
Page One
-
+
Go to Page Two
-
+
`;
}
@@ -63,12 +63,12 @@ Page One
Page Two
-
+
Go to Page Three
-
-
+
+
Go Back
-
+
`;
}
@@ -85,9 +85,9 @@ Page Two
Page Three
-
+
Go Back
-
+
`;
}
diff --git a/core/src/components/nav-pop/nav-pop.tsx b/core/src/components/nav-pop/nav-pop.tsx
deleted file mode 100644
index f350be228d3..00000000000
--- a/core/src/components/nav-pop/nav-pop.tsx
+++ /dev/null
@@ -1,28 +0,0 @@
-import { Component, ComponentInterface, Element, Host, h } from '@stencil/core';
-
-import { navLink } from '../nav-link/nav-link-utils';
-
-/**
- * @deprecated Use `` instead.
- */
-@Component({
- tag: 'ion-nav-pop',
-})
-export class NavPop implements ComponentInterface {
-
- @Element() el!: HTMLElement;
-
- componentDidLoad() {
- console.warn('[DEPRECATED][ion-nav-pop] is deprecated. Use `` instead.');
- }
-
- private pop = () => {
- return navLink(this.el, 'back');
- }
-
- render() {
- return (
-
- );
- }
-}
diff --git a/core/src/components/nav-pop/readme.md b/core/src/components/nav-pop/readme.md
deleted file mode 100644
index c7284798e4a..00000000000
--- a/core/src/components/nav-pop/readme.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# ion-nav-pop
-
-`NavPop` is a component used to automatically go back in navigation. It is the component form of `NavController.pop()`
-
-
-
-
-
-> **[DEPRECATED]** Use `` instead.
-
-----------------------------------------------
-
-*Built with [StencilJS](https://stenciljs.com/)*
diff --git a/core/src/components/nav-pop/test/basic/index.html b/core/src/components/nav-pop/test/basic/index.html
deleted file mode 100644
index d2246ccfcf6..00000000000
--- a/core/src/components/nav-pop/test/basic/index.html
+++ /dev/null
@@ -1,110 +0,0 @@
-
-
-
-
-
- Nav Pop
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/core/src/components/nav-push/nav-push.tsx b/core/src/components/nav-push/nav-push.tsx
deleted file mode 100644
index 6a9489385cc..00000000000
--- a/core/src/components/nav-push/nav-push.tsx
+++ /dev/null
@@ -1,38 +0,0 @@
-import { Component, ComponentInterface, Element, Host, Prop, h } from '@stencil/core';
-
-import { ComponentProps, NavComponent } from '../../interface';
-import { navLink } from '../nav-link/nav-link-utils';
-
-/**
- * @deprecated Use `` instead.
- */
-@Component({
- tag: 'ion-nav-push'
-})
-export class NavPush implements ComponentInterface {
- @Element() el!: HTMLElement;
-
- /**
- * Component to navigate to
- */
- @Prop() component?: NavComponent;
-
- /**
- * Data you want to pass to the component as props
- */
- @Prop() componentProps?: ComponentProps;
-
- componentDidLoad() {
- console.warn('[DEPRECATED][ion-nav-push] `` is deprecated. Use `` instead.');
- }
-
- private push = () => {
- return navLink(this.el, 'forward', this.component, this.componentProps);
- }
-
- render() {
- return (
-
- );
- }
-}
diff --git a/core/src/components/nav-push/readme.md b/core/src/components/nav-push/readme.md
deleted file mode 100644
index 7fc7ad24641..00000000000
--- a/core/src/components/nav-push/readme.md
+++ /dev/null
@@ -1,23 +0,0 @@
-# ion-nav-push
-
-Nav Push is a component used to navigate to the specified component.
-
-It is the component form of `NavController.push()`
-
-
-
-
-
-> **[DEPRECATED]** Use `` instead.
-
-## Properties
-
-| Property | Attribute | Description | Type | Default |
-| ---------------- | ----------- | ----------------------------------------------- | -------------------------------------------------------------------------- | ----------- |
-| `component` | `component` | Component to navigate to | `Function \| HTMLElement \| ViewController \| null \| string \| undefined` | `undefined` |
-| `componentProps` | -- | Data you want to pass to the component as props | `undefined \| { [key: string]: any; }` | `undefined` |
-
-
-----------------------------------------------
-
-*Built with [StencilJS](https://stenciljs.com/)*
diff --git a/core/src/components/nav-push/test/basic/index.html b/core/src/components/nav-push/test/basic/index.html
deleted file mode 100644
index 5b8c6d88f14..00000000000
--- a/core/src/components/nav-push/test/basic/index.html
+++ /dev/null
@@ -1,106 +0,0 @@
-
-
-
-
-
- Nav Push
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/core/src/components/nav-set-root/nav-set-root.tsx b/core/src/components/nav-set-root/nav-set-root.tsx
deleted file mode 100644
index 3ebf21f0c3a..00000000000
--- a/core/src/components/nav-set-root/nav-set-root.tsx
+++ /dev/null
@@ -1,39 +0,0 @@
-import { Component, ComponentInterface, Element, Host, Prop, h } from '@stencil/core';
-
-import { ComponentProps, NavComponent } from '../../interface';
-import { navLink } from '../nav-link/nav-link-utils';
-
-/**
- * @deprecated Use `` instead.
- */
-@Component({
- tag: 'ion-nav-set-root'
-})
-export class NavSetRoot implements ComponentInterface {
- @Element() el!: HTMLElement;
-
- /**
- * Component you want to make root for the navigation stack
- *
- */
- @Prop() component?: NavComponent;
-
- /**
- * Data you want to pass to the component as props
- */
- @Prop() componentProps?: ComponentProps;
-
- componentDidLoad() {
- console.warn('[DEPRECATED][ion-nav-set-root] `` is deprecated. Use `` instead.');
- }
-
- private setRoot = () => {
- return navLink(this.el, 'root', this.component, this.componentProps);
- }
-
- render() {
- return (
-
- );
- }
-}
diff --git a/core/src/components/nav-set-root/readme.md b/core/src/components/nav-set-root/readme.md
deleted file mode 100644
index bbc4e6583f8..00000000000
--- a/core/src/components/nav-set-root/readme.md
+++ /dev/null
@@ -1,22 +0,0 @@
-# ion-nav-set-root
-
-`NavSetRoot` is a component that allows you to set the root of the current navigation stack.
-It is the component form of calling `NavController.setRoot()`
-
-
-
-
-
-> **[DEPRECATED]** Use `` instead.
-
-## Properties
-
-| Property | Attribute | Description | Type | Default |
-| ---------------- | ----------- | -------------------------------------------------------- | -------------------------------------------------------------------------- | ----------- |
-| `component` | `component` | Component you want to make root for the navigation stack | `Function \| HTMLElement \| ViewController \| null \| string \| undefined` | `undefined` |
-| `componentProps` | -- | Data you want to pass to the component as props | `undefined \| { [key: string]: any; }` | `undefined` |
-
-
-----------------------------------------------
-
-*Built with [StencilJS](https://stenciljs.com/)*
diff --git a/core/src/components/nav-set-root/test/basic/index.html b/core/src/components/nav-set-root/test/basic/index.html
deleted file mode 100644
index adf876efae3..00000000000
--- a/core/src/components/nav-set-root/test/basic/index.html
+++ /dev/null
@@ -1,80 +0,0 @@
-
-
-
-
-
- Nav Set Root
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/core/src/components/nav/test/basic/index.html b/core/src/components/nav/test/basic/index.html
index 6f8c61be419..87606c37692 100644
--- a/core/src/components/nav/test/basic/index.html
+++ b/core/src/components/nav/test/basic/index.html
@@ -55,9 +55,9 @@
Page One
-
+
Go to Page Two
-
+
`;
}
@@ -89,9 +89,9 @@ Page One
Page Two
-
+
Go to Page Three
-
+
diff --git a/core/src/components/nav/test/nested/index.html b/core/src/components/nav/test/nested/index.html
index 5db0829a123..ec7ec3ddeec 100644
--- a/core/src/components/nav/test/nested/index.html
+++ b/core/src/components/nav/test/nested/index.html
@@ -20,9 +20,9 @@
Page 1
-
+
Go to Page 2
-
+
`;
}
@@ -50,9 +50,9 @@ Page 1
Page 2.1
-
+
Go to Page 2.2
-
+
`;
@@ -74,9 +74,9 @@ Page 2.1
Page 2.2
-
+
Go to Page 3
-
+
`;
diff --git a/core/src/components/nav/test/routing/index.html b/core/src/components/nav/test/routing/index.html
index 594a6e0d73e..b6fa0439ce5 100644
--- a/core/src/components/nav/test/routing/index.html
+++ b/core/src/components/nav/test/routing/index.html
@@ -21,9 +21,9 @@
Root
-
+
Go to Page One
-
+
`;
@@ -42,9 +42,9 @@ Root
Page One
-
+
Go to Page Two
-
+
`;
}
@@ -63,9 +63,9 @@ Page One
Page Two
-
+
Go to Page Three
-
+
`;
diff --git a/core/src/components/router-outlet/test/basic/index.html b/core/src/components/router-outlet/test/basic/index.html
index e8c6d44b359..b773f4e3628 100644
--- a/core/src/components/router-outlet/test/basic/index.html
+++ b/core/src/components/router-outlet/test/basic/index.html
@@ -39,9 +39,9 @@ Page One
Page Two
-
+
Go to Page Two
-
+
`;
diff --git a/core/src/utils/animation/test/animationbuilder/index.html b/core/src/utils/animation/test/animationbuilder/index.html
index 6d01be60192..75a40176e8a 100644
--- a/core/src/utils/animation/test/animationbuilder/index.html
+++ b/core/src/utils/animation/test/animationbuilder/index.html
@@ -14,7 +14,7 @@
if (forceCSSAnimations) {
Element.prototype.animate = null;
}
-
+
class PageRoot extends HTMLElement {
connectedCallback() {
this.innerHTML = `
@@ -29,9 +29,9 @@
Root
-
+
Go to Page One
-
+
`;
@@ -50,9 +50,9 @@ Root
Page One
-
+
Go to Page Two
-
+
`;
}
@@ -71,9 +71,9 @@ Page One
Page Two
-
+
Go to Page Three
-
+
`;
@@ -100,31 +100,31 @@ Page Three
customElements.define('page-one', PageOne);
customElements.define('page-two', PageTwo);
customElements.define('page-three', PageThree);
-
+
const forceAnimationBuilder = new URLSearchParams(window.location.search).get('ionic:_forceAnimationBuilder');
if (forceAnimationBuilder) {
window.Ionic.config.navAnimation = (AnimationC, navEl, opts) => {
const TRANSLATEY = 'translateY';
const OFF_BOTTOM = '40px';
const CENTER = '0px';
-
+
const backDirection = (opts.direction === 'back');
const enteringEl = opts.enteringEl;
const leavingEl = opts.leavingEl;
const ionPageElement = getIonPageElement(enteringEl);
const enteringToolbarEle = ionPageElement.querySelector('ion-toolbar');
const rootTransition = new AnimationC();
-
+
rootTransition
.addElement(ionPageElement)
.beforeRemoveClass('ion-page-invisible');
-
+
// animate the component itself
if (backDirection) {
rootTransition
.duration(opts.duration || 200)
.easing('cubic-bezier(0.47,0,0.745,0.715)');
-
+
} else {
rootTransition
.duration(opts.duration || 280)
@@ -132,39 +132,39 @@ Page Three
.fromTo(TRANSLATEY, OFF_BOTTOM, CENTER, true)
.fromTo('opacity', 0.01, 1, true);
}
-
+
// Animate toolbar if it's there
if (enteringToolbarEle) {
const enteringToolBar = new AnimationC();
enteringToolBar.addElement(enteringToolbarEle);
rootTransition.add(enteringToolBar);
}
-
+
// setup leaving view
if (leavingEl && backDirection) {
// leaving content
rootTransition
.duration(opts.duration || 200)
.easing('cubic-bezier(0.47,0,0.745,0.715)');
-
+
const leavingPage = new AnimationC();
leavingPage
.addElement(getIonPageElement(leavingEl))
.fromTo(TRANSLATEY, CENTER, OFF_BOTTOM)
.fromTo('opacity', 1, 0);
-
+
rootTransition.add(leavingPage);
}
-
+
return Promise.resolve(rootTransition);
};
}
-
+
const getIonPageElement = (element) => {
if (element.classList.contains('ion-page')) {
return element;
}
-
+
const ionPage = element.querySelector(':scope > .ion-page, :scope > ion-nav, :scope > ion-tabs');
if (ionPage) {
return ionPage;
diff --git a/core/stencil.config.ts b/core/stencil.config.ts
index 39425c6f069..eb9d6eb5628 100644
--- a/core/stencil.config.ts
+++ b/core/stencil.config.ts
@@ -28,7 +28,7 @@ export const config: Config = {
{ components: ['ion-loading'] },
{ components: ['ion-menu', 'ion-menu-controller', 'ion-menu-toggle', 'ion-menu-button'] },
{ components: ['ion-modal'] },
- { components: ['ion-nav', 'ion-nav-link', 'ion-nav-pop', 'ion-nav-push', 'ion-nav-set-root'] },
+ { components: ['ion-nav', 'ion-nav-link'] },
{ components: ['ion-img'] },
{ components: ['ion-popover'] },
{ components: ['ion-progress-bar'] },