javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2025-11-08 23:58:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor(app): remove overlay portal

Browse Source
This commit is contained in:
Dan Bucholtz
2017-09-18 09:54:16 -05:00
parent 07e433097d
commit 1291f8becd
5 changed files with 8 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/core/src/components/app/app-constants.ts
View File

@ -1,4 +0,0 @@
export const PORTAL_DEFAULT = 'general';
export const PORTAL_LOADING = 'loading';
export const PORTAL_MODAL = 'modal';
export const PORTAL_TOAST = 'toast';

25
packages/core/src/components/app/app.tsx
View File

@ -1,18 +1,10 @@
import { Element, Component, Listen, Prop } from '@stencil/core';
import { Nav, NavContainer, OverlayPortal } from '../../navigation/nav-interfaces';
import { Nav, NavContainer } from '../../navigation/nav-interfaces';
import { Config } from '../..';
import { App } from './app-interfaces';
import { isReady } from '../../utils/helpers';
import {
PORTAL_DEFAULT,
PORTAL_LOADING,
PORTAL_MODAL,
PORTAL_TOAST
} from './app-constants';
const rootNavs = new Map<number, Nav>();
const portals = new Map<string, OverlayPortal>();
@Component({
tag: 'ion-app',
@ -35,20 +27,19 @@ export class IonApp implements App {
rootNavs.set((event.detail as Nav).id, (event.detail as Nav));
}
@Listen('body:registerPortal')
registerPortal(event: CustomEvent) {
portals.set((event.detail as OverlayPortal).type, (event.detail as OverlayPortal));
}
componentWillLoad() {
componentDidLoadImpl(this);
}
getActiveNavs(rootNavId?: number): Nav[] {
const portal = portals.get(PORTAL_MODAL);
/*const portal = portals.get(PORTAL_MODAL);
if (portal && portal.views && portal.views.length) {
return findTopNavs(portal);
}
*/
// TODO - figure out if a modal is open, don't use portal
if (!rootNavs.size) {
return [];
}
@ -79,11 +70,7 @@ export class IonApp implements App {
render() {
return ([
<slot></slot>,
<ion-overlay-portal type={PORTAL_MODAL}></ion-overlay-portal>,
<ion-overlay-portal type={PORTAL_DEFAULT}></ion-overlay-portal>,
<ion-overlay-portal type={PORTAL_LOADING}></ion-overlay-portal>,
<ion-overlay-portal type={PORTAL_TOAST}></ion-overlay-portal>,
<slot></slot>
]);
}
}

45
packages/core/src/components/overlay-portal/overlay-portal.tsx
View File

@ -1,45 +0,0 @@
import { Component, Element, Event, EventEmitter, Prop } from '@stencil/core';
import { Nav, NavContainer, OverlayPortal } from '../../navigation/nav-interfaces';
@Component({
tag: 'ion-overlay-portal'
})
export class IonOverlayPortal implements NavContainer, OverlayPortal {
id: number;
name: string;
parent: Nav;
@Element() element: HTMLElement;
@Prop() type: string;
@Event() registerPortal: EventEmitter;
getActiveChildNavs(): NavContainer[] {
throw new Error("Method not implemented.");
}
getAllChildNavs?(): NavContainer[] {
throw new Error("Method not implemented.");
}
getType(): string {
return 'portal';
}
getSecondaryIdentifier(): string {
return null;
}
componentWillLoad() {
componentWillLoadImpl(this);
}
render() {
return <slot></slot>;
}
}
export function componentWillLoadImpl(overlayPortal: OverlayPortal) {
overlayPortal.registerPortal.emit(overlayPortal);
}