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

chore(): sync with main

Browse Source
This commit is contained in:
Liam DeBeasi
2022-12-08 12:39:38 -05:00
parent 5d4a0a56bf aedf306d64
commit b18a193684
457 changed files with 927 additions and 3106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,6 +1,7 @@
import type { ComponentInterface, EventEmitter } from '@stencil/core';
import { Watch, Component, Element, Event, Host, Method, Prop, h } from '@stencil/core';
import { Watch, Component, Element, Event, h, Host, Method, Prop } from '@stencil/core';
import { config } from '../../global/config';
import { getIonMode } from '../../global/ionic-global';
import type {
AnimationBuilder,
@ -95,7 +96,7 @@ export class Toast implements ComponentInterface, OverlayInterface {
* How many milliseconds to wait before hiding the toast. By default, it will show
* until `dismiss()` is called.
*/
@Prop() duration = 0;
@Prop() duration = config.getNumber('toastDuration', 0);
/**
* Header to be shown in the toast.
@ -115,7 +116,7 @@ export class Toast implements ComponentInterface, OverlayInterface {
/**
* The position of the toast on the screen.
*/
@Prop() position: 'top' | 'bottom' | 'middle' = 'bottom';
@Prop() position: ToastPosition = 'bottom';
/**
* An array of buttons for the toast.
@ -247,7 +248,13 @@ export class Toast implements ComponentInterface, OverlayInterface {
await this.delegateController.attachViewToDom();
this.currentTransition = present(this, 'toastEnter', iosEnterAnimation, mdEnterAnimation, this.position);
this.currentTransition = present<ToastPresentOptions>(
this,
'toastEnter',
iosEnterAnimation,
mdEnterAnimation,
this.position
);
await this.currentTransition;
this.currentTransition = undefined;
@ -271,7 +278,7 @@ export class Toast implements ComponentInterface, OverlayInterface {
clearTimeout(this.durationTimeout);
}
this.currentTransition = dismiss(
this.currentTransition = dismiss<ToastDismissOptions>(
this,
data,
role,
@ -453,3 +460,6 @@ const buttonClass = (button: ToastButton): CssClassMap => {
...getClassMap(button.cssClass),
};
};
type ToastPresentOptions = ToastPosition;
type ToastDismissOptions = ToastPosition;