octicon-mirror(24/)
javascript/ionic-framework
octicon-rss(16/)
1
0
octicon-repo-forked(16/)Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2025-11-10 22:44:13 +08:00
octicon-code(16/) Code octicon-issue-opened(16/) Issues octicon-package(16/) Packages octicon-project(16/) Projects octicon-tag(16/) Releases octicon-book(16/) Wiki octicon-pulse(16/) Activity

refactor(overlay): update to latest overlay syntax

Browse Source
This commit is contained in:
octicon-git-branch(16/)
octicon-tag(16/)
Brandy Carney
2017-08-12 14:43:52 -04:00
gitea-unlock(16/)
parent 3b09d0f4a0
commit f1c0a63476
octicon-diff(16/tw-mr-1) 23 changed files with 280 additions and 334 deletions
gitea-whitespace(16/)
gitea-split(16/)
octicon-kebab-horizontal(16/)
Download Patch File Download Diff File Expand all files Collapse all files

36
packages/core/src/components/popover-controller/popover-controller.scss
View File

@@ -1,36 +0,0 @@
@import "../../themes/ionic.globals";
// Popover Controller
// --------------------------------------------------
ion-popover-controller {
display: none;
}
// Popover Controller Backdrop
// --------------------------------------------------
/// @prop - Color of the backdrop
$popover-backdrop-color: #000 !default;
.popover-backdrop {
position: absolute;
top: 0;
left: 0;
z-index: $z-index-backdrop;
display: block;
width: 100%;
height: 100%;
background-color: $popover-backdrop-color;
opacity: .01;
transform: translateZ(0);
}
.popover-backdrop.backdrop-no-tappable {
cursor: auto;
}

31
packages/core/src/components/popover-controller/popover-controller.tsx
View File

@@ -1,25 +1,17 @@
import { Component, Listen } from '@stencil/core';
import { PopoverEvent, PopoverOptions, Popover, IonicControllerApi, Ionic } from '../../index';
import { Component, Listen, Method } from '@stencil/core';
import { PopoverEvent, PopoverOptions, Popover } from '../../index';
@Component({
tag: 'ion-popover-controller',
// styleUrl: 'popover-controller.scss'
tag: 'ion-popover-controller'
})
export class PopoverController implements IonicControllerApi {
export class PopoverController {
private ids = 0;
private popoverResolves: {[popoverId: string]: Function} = {};
private popovers: Popover[] = [];
private appRoot: Element;
ionViewDidLoad() {
this.appRoot = document.querySelector('ion-app') || document.body;
Ionic.registerController('popover', this);
}
load(opts?: PopoverOptions) {
@Method()
create(opts?: PopoverOptions) {
// create ionic's wrapping ion-popover component
const popover = document.createElement('ion-popover');
const id = this.ids++;
@@ -33,7 +25,8 @@ export class PopoverController implements IonicControllerApi {
Object.assign(popover, opts);
// append the popover element to the document body
this.appRoot.appendChild(popover as any);
const appRoot = document.querySelector('ion-app') || document.body;
appRoot.appendChild(popover as any);
// store the resolve function to be called later up when the popover loads
return new Promise<Popover>(resolve => {
@@ -43,7 +36,7 @@ export class PopoverController implements IonicControllerApi {
@Listen('body:ionPopoverDidLoad')
viewDidLoad(ev: PopoverEvent) {
protected viewDidLoad(ev: PopoverEvent) {
const popover = ev.detail.popover;
const popoverResolve = this.popoverResolves[popover.id];
if (popoverResolve) {
@@ -54,13 +47,13 @@ export class PopoverController implements IonicControllerApi {
@Listen('body:ionPopoverWillPresent')
willPresent(ev: PopoverEvent) {
protected willPresent(ev: PopoverEvent) {
this.popovers.push(ev.detail.popover);
}
@Listen('body:ionPopoverWillDismiss, body:ionPopoverDidUnload')
willDismiss(ev: PopoverEvent) {
protected willDismiss(ev: PopoverEvent) {
const index = this.popovers.indexOf(ev.detail.popover);
if (index > -1) {
this.popovers.splice(index, 1);
@@ -69,7 +62,7 @@ export class PopoverController implements IonicControllerApi {
@Listen('body:keyup.escape')
escapeKeyUp() {
protected escapeKeyUp() {
const lastPopover = this.popovers[this.popovers.length - 1];
if (lastPopover) {
lastPopover.dismiss();