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

chore(): resolve merge conflicts for beta

Browse Source
This commit is contained in:
Liam DeBeasi
2021-09-15 12:02:43 -04:00
parent 18765e7e39 874e791377
commit ecb30af4d8
46 changed files with 440 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/src/components/toast/toast.tsx
View File

@ -10,6 +10,7 @@ import { iosEnterAnimation } from './animations/ios.enter';
import { iosLeaveAnimation } from './animations/ios.leave';
import { mdEnterAnimation } from './animations/md.enter';
import { mdLeaveAnimation } from './animations/md.leave';
import { ToastAttributes } from './toast-interface';
/**
* @virtualProp {"ios" | "md"} mode - The mode determines which platform styles to use.
@ -113,6 +114,11 @@ export class Toast implements ComponentInterface, OverlayInterface {
*/
@Prop() icon?: string;
/**
* Additional attributes to pass to the toast.
*/
@Prop() htmlAttributes?: ToastAttributes;
/**
* Emitted after the toast has presented.
*/
@ -270,9 +276,13 @@ export class Toast implements ComponentInterface, OverlayInterface {
'toast-wrapper': true,
[`toast-${this.position}`]: true
};
const role = allButtons.length > 0 ? 'dialog' : 'status';
return (
<Host
role={role}
tabindex="-1"
{...this.htmlAttributes as any}
style={{
zIndex: `${60000 + this.overlayIndex}`,
}}
@ -281,7 +291,6 @@ export class Toast implements ComponentInterface, OverlayInterface {
...getClassMap(this.cssClass),
'toast-translucent': this.translucent
})}
tabindex="-1"
onIonToastWillDismiss={this.dispatchCancelHandler}
>
<div class={wrapperClass}>