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

refactor(all): data -> componentProps

Browse Source
This commit is contained in:
Manu Mtz.-Almeida
2018-03-29 18:18:02 +02:00
parent ce500858fe
commit a36913e9db
17 changed files with 115 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
core/src/components/modal/modal.tsx
View File

@ -1,5 +1,5 @@
import { Component, Element, Event, EventEmitter, Listen, Method, Prop } from '@stencil/core';
import { Animation, AnimationBuilder, Config, FrameworkDelegate } from '../../index';
import { Animation, AnimationBuilder, ComponentProps, ComponentRef, Config, FrameworkDelegate } from '../../index';
import { createThemedClasses, getClassList } from '../../utils/theme';
import { BACKDROP, OverlayEventDetail, OverlayInterface, dismiss, eventMethod, present } from '../../utils/overlays';
@ -64,18 +64,18 @@ export class Modal implements OverlayInterface {
/**
* The component to display inside of the modal.
*/
@Prop() component: any;
@Prop() component: ComponentRef;
/**
* The data to pass to the modal component.
*/
@Prop() data: any = {};
@Prop() componentProps: ComponentProps;
/**
* Additional classes to apply for custom CSS. If multiple classes are
* provided they should be separated by spaces.
*/
@Prop() cssClass: string;
@Prop() cssClass: string | string[];
/**
* If true, the modal will be dismissed when the backdrop is clicked. Defaults to `true`.
@ -169,15 +169,15 @@ export class Modal implements OverlayInterface {
return Promise.resolve();
}
const container = this.el.querySelector(`.modal-wrapper`);
const data = {
...this.data,
const componentProps = {
...this.componentProps,
modal: this.el
};
const classes = [
...getClassList(this.cssClass),
'ion-page'
];
this.usersElement = await attachComponent(this.delegate, container, this.component, classes, data);
this.usersElement = await attachComponent(this.delegate, container, this.component, classes, componentProps);
return present(this, 'modalEnter', iosEnterAnimation, mdEnterAnimation);
}
@ -243,12 +243,12 @@ const LIFECYCLE_MAP: any = {
};
export interface ModalOptions {
component: any;
data?: any;
component: ComponentRef;
componentProps?: ComponentProps;
showBackdrop?: boolean;
enableBackdropDismiss?: boolean;
enterAnimation?: AnimationBuilder;
leaveAnimation?: AnimationBuilder;
cssClass?: string;
cssClass?: string | string[];
delegate?: FrameworkDelegate;
}