mirror of
https://github.com/ionic-team/ionic-framework.git
synced 2025-08-15 01:03:03 +08:00
feat(toast): add ability to use toast inline (#26215)
This commit is contained in:
@ -1353,20 +1353,26 @@ ion-toast,prop,enterAnimation,((baseEl: any, opts?: any) => Animation) | undefin
|
|||||||
ion-toast,prop,header,string | undefined,undefined,false,false
|
ion-toast,prop,header,string | undefined,undefined,false,false
|
||||||
ion-toast,prop,htmlAttributes,undefined | { [key: string]: any; },undefined,false,false
|
ion-toast,prop,htmlAttributes,undefined | { [key: string]: any; },undefined,false,false
|
||||||
ion-toast,prop,icon,string | undefined,undefined,false,false
|
ion-toast,prop,icon,string | undefined,undefined,false,false
|
||||||
|
ion-toast,prop,isOpen,boolean,false,false,false
|
||||||
ion-toast,prop,keyboardClose,boolean,false,false,false
|
ion-toast,prop,keyboardClose,boolean,false,false,false
|
||||||
ion-toast,prop,leaveAnimation,((baseEl: any, opts?: any) => Animation) | undefined,undefined,false,false
|
ion-toast,prop,leaveAnimation,((baseEl: any, opts?: any) => Animation) | undefined,undefined,false,false
|
||||||
ion-toast,prop,message,IonicSafeString | string | undefined,undefined,false,false
|
ion-toast,prop,message,IonicSafeString | string | undefined,undefined,false,false
|
||||||
ion-toast,prop,mode,"ios" | "md",undefined,false,false
|
ion-toast,prop,mode,"ios" | "md",undefined,false,false
|
||||||
ion-toast,prop,position,"bottom" | "middle" | "top",'bottom',false,false
|
ion-toast,prop,position,"bottom" | "middle" | "top",'bottom',false,false
|
||||||
ion-toast,prop,translucent,boolean,false,false,false
|
ion-toast,prop,translucent,boolean,false,false,false
|
||||||
|
ion-toast,prop,trigger,string | undefined,undefined,false,false
|
||||||
ion-toast,method,dismiss,dismiss(data?: any, role?: string) => Promise<boolean>
|
ion-toast,method,dismiss,dismiss(data?: any, role?: string) => Promise<boolean>
|
||||||
ion-toast,method,onDidDismiss,onDidDismiss<T = any>() => Promise<OverlayEventDetail<T>>
|
ion-toast,method,onDidDismiss,onDidDismiss<T = any>() => Promise<OverlayEventDetail<T>>
|
||||||
ion-toast,method,onWillDismiss,onWillDismiss<T = any>() => Promise<OverlayEventDetail<T>>
|
ion-toast,method,onWillDismiss,onWillDismiss<T = any>() => Promise<OverlayEventDetail<T>>
|
||||||
ion-toast,method,present,present() => Promise<void>
|
ion-toast,method,present,present() => Promise<void>
|
||||||
|
ion-toast,event,didDismiss,OverlayEventDetail<any>,true
|
||||||
|
ion-toast,event,didPresent,void,true
|
||||||
ion-toast,event,ionToastDidDismiss,OverlayEventDetail<any>,true
|
ion-toast,event,ionToastDidDismiss,OverlayEventDetail<any>,true
|
||||||
ion-toast,event,ionToastDidPresent,void,true
|
ion-toast,event,ionToastDidPresent,void,true
|
||||||
ion-toast,event,ionToastWillDismiss,OverlayEventDetail<any>,true
|
ion-toast,event,ionToastWillDismiss,OverlayEventDetail<any>,true
|
||||||
ion-toast,event,ionToastWillPresent,void,true
|
ion-toast,event,ionToastWillPresent,void,true
|
||||||
|
ion-toast,event,willDismiss,OverlayEventDetail<any>,true
|
||||||
|
ion-toast,event,willPresent,void,true
|
||||||
ion-toast,css-prop,--background
|
ion-toast,css-prop,--background
|
||||||
ion-toast,css-prop,--border-color
|
ion-toast,css-prop,--border-color
|
||||||
ion-toast,css-prop,--border-radius
|
ion-toast,css-prop,--border-radius
|
||||||
|
36
core/src/components.d.ts
vendored
36
core/src/components.d.ts
vendored
@ -2849,6 +2849,7 @@ export namespace Components {
|
|||||||
* Additional classes to apply for custom CSS. If multiple classes are provided they should be separated by spaces.
|
* Additional classes to apply for custom CSS. If multiple classes are provided they should be separated by spaces.
|
||||||
*/
|
*/
|
||||||
"cssClass"?: string | string[];
|
"cssClass"?: string | string[];
|
||||||
|
"delegate"?: FrameworkDelegate;
|
||||||
/**
|
/**
|
||||||
* Dismiss the toast overlay after it has been presented.
|
* Dismiss the toast overlay after it has been presented.
|
||||||
* @param data Any data to emit in the dismiss events.
|
* @param data Any data to emit in the dismiss events.
|
||||||
@ -2863,6 +2864,7 @@ export namespace Components {
|
|||||||
* Animation to use when the toast is presented.
|
* Animation to use when the toast is presented.
|
||||||
*/
|
*/
|
||||||
"enterAnimation"?: AnimationBuilder;
|
"enterAnimation"?: AnimationBuilder;
|
||||||
|
"hasController": boolean;
|
||||||
/**
|
/**
|
||||||
* Header to be shown in the toast.
|
* Header to be shown in the toast.
|
||||||
*/
|
*/
|
||||||
@ -2875,6 +2877,10 @@ export namespace Components {
|
|||||||
* The name of the icon to display, or the path to a valid SVG file. See `ion-icon`. https://ionic.io/ionicons
|
* The name of the icon to display, or the path to a valid SVG file. See `ion-icon`. https://ionic.io/ionicons
|
||||||
*/
|
*/
|
||||||
"icon"?: string;
|
"icon"?: string;
|
||||||
|
/**
|
||||||
|
* If `true`, the toast will open. If `false`, the toast will close. Use this if you need finer grained control over presentation, otherwise just use the toastController or the `trigger` property. Note: `isOpen` will not automatically be set back to `false` when the toast dismisses. You will need to do that in your code.
|
||||||
|
*/
|
||||||
|
"isOpen": boolean;
|
||||||
/**
|
/**
|
||||||
* If `true`, the keyboard will be automatically dismissed when the overlay is presented.
|
* If `true`, the keyboard will be automatically dismissed when the overlay is presented.
|
||||||
*/
|
*/
|
||||||
@ -2912,6 +2918,10 @@ export namespace Components {
|
|||||||
* If `true`, the toast will be translucent. Only applies when the mode is `"ios"` and the device supports [`backdrop-filter`](https://developer.mozilla.org/en-US/docs/Web/CSS/backdrop-filter#Browser_compatibility).
|
* If `true`, the toast will be translucent. Only applies when the mode is `"ios"` and the device supports [`backdrop-filter`](https://developer.mozilla.org/en-US/docs/Web/CSS/backdrop-filter#Browser_compatibility).
|
||||||
*/
|
*/
|
||||||
"translucent": boolean;
|
"translucent": boolean;
|
||||||
|
/**
|
||||||
|
* An ID corresponding to the trigger element that causes the toast to open when clicked.
|
||||||
|
*/
|
||||||
|
"trigger": string | undefined;
|
||||||
}
|
}
|
||||||
interface IonToggle {
|
interface IonToggle {
|
||||||
/**
|
/**
|
||||||
@ -6727,6 +6737,7 @@ declare namespace LocalJSX {
|
|||||||
* Additional classes to apply for custom CSS. If multiple classes are provided they should be separated by spaces.
|
* Additional classes to apply for custom CSS. If multiple classes are provided they should be separated by spaces.
|
||||||
*/
|
*/
|
||||||
"cssClass"?: string | string[];
|
"cssClass"?: string | string[];
|
||||||
|
"delegate"?: FrameworkDelegate;
|
||||||
/**
|
/**
|
||||||
* How many milliseconds to wait before hiding the toast. By default, it will show until `dismiss()` is called.
|
* How many milliseconds to wait before hiding the toast. By default, it will show until `dismiss()` is called.
|
||||||
*/
|
*/
|
||||||
@ -6735,6 +6746,7 @@ declare namespace LocalJSX {
|
|||||||
* Animation to use when the toast is presented.
|
* Animation to use when the toast is presented.
|
||||||
*/
|
*/
|
||||||
"enterAnimation"?: AnimationBuilder;
|
"enterAnimation"?: AnimationBuilder;
|
||||||
|
"hasController"?: boolean;
|
||||||
/**
|
/**
|
||||||
* Header to be shown in the toast.
|
* Header to be shown in the toast.
|
||||||
*/
|
*/
|
||||||
@ -6747,6 +6759,10 @@ declare namespace LocalJSX {
|
|||||||
* The name of the icon to display, or the path to a valid SVG file. See `ion-icon`. https://ionic.io/ionicons
|
* The name of the icon to display, or the path to a valid SVG file. See `ion-icon`. https://ionic.io/ionicons
|
||||||
*/
|
*/
|
||||||
"icon"?: string;
|
"icon"?: string;
|
||||||
|
/**
|
||||||
|
* If `true`, the toast will open. If `false`, the toast will close. Use this if you need finer grained control over presentation, otherwise just use the toastController or the `trigger` property. Note: `isOpen` will not automatically be set back to `false` when the toast dismisses. You will need to do that in your code.
|
||||||
|
*/
|
||||||
|
"isOpen"?: boolean;
|
||||||
/**
|
/**
|
||||||
* If `true`, the keyboard will be automatically dismissed when the overlay is presented.
|
* If `true`, the keyboard will be automatically dismissed when the overlay is presented.
|
||||||
*/
|
*/
|
||||||
@ -6763,6 +6779,14 @@ declare namespace LocalJSX {
|
|||||||
* The mode determines which platform styles to use.
|
* The mode determines which platform styles to use.
|
||||||
*/
|
*/
|
||||||
"mode"?: "ios" | "md";
|
"mode"?: "ios" | "md";
|
||||||
|
/**
|
||||||
|
* Emitted after the toast has dismissed. Shorthand for ionToastDidDismiss.
|
||||||
|
*/
|
||||||
|
"onDidDismiss"?: (event: IonToastCustomEvent<OverlayEventDetail>) => void;
|
||||||
|
/**
|
||||||
|
* Emitted after the toast has presented. Shorthand for ionToastWillDismiss.
|
||||||
|
*/
|
||||||
|
"onDidPresent"?: (event: IonToastCustomEvent<void>) => void;
|
||||||
/**
|
/**
|
||||||
* Emitted after the toast has dismissed.
|
* Emitted after the toast has dismissed.
|
||||||
*/
|
*/
|
||||||
@ -6779,6 +6803,14 @@ declare namespace LocalJSX {
|
|||||||
* Emitted before the toast has presented.
|
* Emitted before the toast has presented.
|
||||||
*/
|
*/
|
||||||
"onIonToastWillPresent"?: (event: IonToastCustomEvent<void>) => void;
|
"onIonToastWillPresent"?: (event: IonToastCustomEvent<void>) => void;
|
||||||
|
/**
|
||||||
|
* Emitted before the toast has dismissed. Shorthand for ionToastWillDismiss.
|
||||||
|
*/
|
||||||
|
"onWillDismiss"?: (event: IonToastCustomEvent<OverlayEventDetail>) => void;
|
||||||
|
/**
|
||||||
|
* Emitted before the toast has presented. Shorthand for ionToastWillPresent.
|
||||||
|
*/
|
||||||
|
"onWillPresent"?: (event: IonToastCustomEvent<void>) => void;
|
||||||
"overlayIndex": number;
|
"overlayIndex": number;
|
||||||
/**
|
/**
|
||||||
* The position of the toast on the screen.
|
* The position of the toast on the screen.
|
||||||
@ -6788,6 +6820,10 @@ declare namespace LocalJSX {
|
|||||||
* If `true`, the toast will be translucent. Only applies when the mode is `"ios"` and the device supports [`backdrop-filter`](https://developer.mozilla.org/en-US/docs/Web/CSS/backdrop-filter#Browser_compatibility).
|
* If `true`, the toast will be translucent. Only applies when the mode is `"ios"` and the device supports [`backdrop-filter`](https://developer.mozilla.org/en-US/docs/Web/CSS/backdrop-filter#Browser_compatibility).
|
||||||
*/
|
*/
|
||||||
"translucent"?: boolean;
|
"translucent"?: boolean;
|
||||||
|
/**
|
||||||
|
* An ID corresponding to the trigger element that causes the toast to open when clicked.
|
||||||
|
*/
|
||||||
|
"trigger"?: string | undefined;
|
||||||
}
|
}
|
||||||
interface IonToggle {
|
interface IonToggle {
|
||||||
/**
|
/**
|
||||||
|
50
core/src/components/toast/test/isOpen/index.html
Normal file
50
core/src/components/toast/test/isOpen/index.html
Normal file
@ -0,0 +1,50 @@
|
|||||||
|
<!DOCTYPE html>
|
||||||
|
<html lang="en" dir="ltr">
|
||||||
|
<head>
|
||||||
|
<meta charset="UTF-8" />
|
||||||
|
<title>Toast - isOpen</title>
|
||||||
|
<meta
|
||||||
|
name="viewport"
|
||||||
|
content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no, viewport-fit=cover"
|
||||||
|
/>
|
||||||
|
<link href="../../../../../css/ionic.bundle.css" rel="stylesheet" />
|
||||||
|
<link href="../../../../../scripts/testing/styles.css" rel="stylesheet" />
|
||||||
|
<script src="../../../../../scripts/testing/scripts.js"></script>
|
||||||
|
<script type="module" src="../../../../../dist/ionic/ionic.esm.js"></script>
|
||||||
|
</head>
|
||||||
|
|
||||||
|
<body>
|
||||||
|
<ion-app>
|
||||||
|
<ion-header>
|
||||||
|
<ion-toolbar>
|
||||||
|
<ion-title>Toast - isOpen</ion-title>
|
||||||
|
</ion-toolbar>
|
||||||
|
</ion-header>
|
||||||
|
|
||||||
|
<ion-content class="ion-padding">
|
||||||
|
<ion-button id="default" onclick="openToast()">Open Toast, 2s Duration</ion-button>
|
||||||
|
<ion-button id="timeout" onclick="openToast(500)">Open Toast, Close Manually After 500ms</ion-button>
|
||||||
|
|
||||||
|
<ion-toast message="Hello World" duration="2000"></ion-toast>
|
||||||
|
</ion-content>
|
||||||
|
</ion-app>
|
||||||
|
|
||||||
|
<script>
|
||||||
|
const toast = document.querySelector('ion-toast');
|
||||||
|
|
||||||
|
const openToast = (timeout) => {
|
||||||
|
toast.isOpen = true;
|
||||||
|
|
||||||
|
if (timeout) {
|
||||||
|
setTimeout(() => {
|
||||||
|
toast.isOpen = false;
|
||||||
|
}, timeout);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
toast.addEventListener('ionToastDidDismiss', () => {
|
||||||
|
toast.isOpen = false;
|
||||||
|
});
|
||||||
|
</script>
|
||||||
|
</body>
|
||||||
|
</html>
|
30
core/src/components/toast/test/isOpen/toast.e2e.ts
Normal file
30
core/src/components/toast/test/isOpen/toast.e2e.ts
Normal file
@ -0,0 +1,30 @@
|
|||||||
|
import { test } from '@utils/test/playwright';
|
||||||
|
|
||||||
|
test.describe('toast: isOpen', () => {
|
||||||
|
test.beforeEach(async ({ page, skip }) => {
|
||||||
|
skip.rtl('isOpen does not behave differently in RTL');
|
||||||
|
skip.mode('md', 'isOpen does not behave differently in MD');
|
||||||
|
await page.goto('/src/components/toast/test/isOpen');
|
||||||
|
});
|
||||||
|
|
||||||
|
test('should open the toast', async ({ page }) => {
|
||||||
|
const ionToastDidPresent = await page.spyOnEvent('ionToastDidPresent');
|
||||||
|
await page.click('#default');
|
||||||
|
|
||||||
|
await ionToastDidPresent.next();
|
||||||
|
await page.waitForSelector('ion-toast', { state: 'visible' });
|
||||||
|
});
|
||||||
|
|
||||||
|
test('should open the toast then close after a timeout', async ({ page }) => {
|
||||||
|
const ionToastDidPresent = await page.spyOnEvent('ionToastDidPresent');
|
||||||
|
const ionToastDidDismiss = await page.spyOnEvent('ionToastDidDismiss');
|
||||||
|
await page.click('#timeout');
|
||||||
|
|
||||||
|
await ionToastDidPresent.next();
|
||||||
|
await page.waitForSelector('ion-toast', { state: 'visible' });
|
||||||
|
|
||||||
|
await ionToastDidDismiss.next();
|
||||||
|
|
||||||
|
await page.waitForSelector('ion-toast', { state: 'hidden' });
|
||||||
|
});
|
||||||
|
});
|
43
core/src/components/toast/test/trigger/index.html
Normal file
43
core/src/components/toast/test/trigger/index.html
Normal file
@ -0,0 +1,43 @@
|
|||||||
|
<!DOCTYPE html>
|
||||||
|
<html lang="en" dir="ltr">
|
||||||
|
<head>
|
||||||
|
<meta charset="UTF-8" />
|
||||||
|
<title>Toast - Trigger</title>
|
||||||
|
<meta
|
||||||
|
name="viewport"
|
||||||
|
content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no, viewport-fit=cover"
|
||||||
|
/>
|
||||||
|
<link href="../../../../../css/ionic.bundle.css" rel="stylesheet" />
|
||||||
|
<link href="../../../../../scripts/testing/styles.css" rel="stylesheet" />
|
||||||
|
<script src="../../../../../scripts/testing/scripts.js"></script>
|
||||||
|
<script type="module" src="../../../../../dist/ionic/ionic.esm.js"></script>
|
||||||
|
</head>
|
||||||
|
|
||||||
|
<body>
|
||||||
|
<ion-app>
|
||||||
|
<ion-header>
|
||||||
|
<ion-toolbar>
|
||||||
|
<ion-title>Toast - Trigger</ion-title>
|
||||||
|
</ion-toolbar>
|
||||||
|
</ion-header>
|
||||||
|
|
||||||
|
<ion-content class="ion-padding">
|
||||||
|
<ion-button id="default">Open Toast, 2s Duration</ion-button>
|
||||||
|
<ion-button id="timeout">Open Toast, Close Manually After 500ms</ion-button>
|
||||||
|
|
||||||
|
<ion-toast id="default-toast" trigger="default" message="Hello World" duration="2000"></ion-toast>
|
||||||
|
<ion-toast id="timeout-toast" trigger="timeout" message="Hello World" duration="2000"></ion-toast>
|
||||||
|
</ion-content>
|
||||||
|
</ion-app>
|
||||||
|
|
||||||
|
<script>
|
||||||
|
const timeoutToast = document.querySelector('#timeout-toast');
|
||||||
|
|
||||||
|
timeoutToast.addEventListener('didPresent', () => {
|
||||||
|
setTimeout(() => {
|
||||||
|
timeoutToast.dismiss();
|
||||||
|
}, 500);
|
||||||
|
});
|
||||||
|
</script>
|
||||||
|
</body>
|
||||||
|
</html>
|
31
core/src/components/toast/test/trigger/toast.e2e.ts
Normal file
31
core/src/components/toast/test/trigger/toast.e2e.ts
Normal file
@ -0,0 +1,31 @@
|
|||||||
|
import { test } from '@utils/test/playwright';
|
||||||
|
|
||||||
|
test.describe('toast: trigger', () => {
|
||||||
|
test.beforeEach(async ({ page, skip }) => {
|
||||||
|
skip.rtl('trigger does not behave differently in RTL');
|
||||||
|
skip.mode('md');
|
||||||
|
await page.goto('/src/components/toast/test/trigger');
|
||||||
|
});
|
||||||
|
|
||||||
|
test('should open the toast', async ({ page }) => {
|
||||||
|
const ionToastDidPresent = await page.spyOnEvent('ionToastDidPresent');
|
||||||
|
await page.click('#default');
|
||||||
|
|
||||||
|
await ionToastDidPresent.next();
|
||||||
|
await page.waitForSelector('#default-toast', { state: 'visible' });
|
||||||
|
});
|
||||||
|
|
||||||
|
test('should present a previously presented toast', async ({ page }) => {
|
||||||
|
const ionToastDidPresent = await page.spyOnEvent('ionToastDidPresent');
|
||||||
|
const ionToastDidDismiss = await page.spyOnEvent('ionToastDidDismiss');
|
||||||
|
|
||||||
|
await page.click('#timeout');
|
||||||
|
|
||||||
|
await ionToastDidDismiss.next();
|
||||||
|
|
||||||
|
await page.click('#timeout');
|
||||||
|
|
||||||
|
await ionToastDidPresent.next();
|
||||||
|
await page.waitForSelector('#timeout-toast', { state: 'visible' });
|
||||||
|
});
|
||||||
|
});
|
@ -1,5 +1,5 @@
|
|||||||
import type { ComponentInterface, EventEmitter } from '@stencil/core';
|
import type { ComponentInterface, EventEmitter } from '@stencil/core';
|
||||||
import { Component, Element, Event, Host, Method, Prop, h } from '@stencil/core';
|
import { Watch, Component, Element, Event, Host, Method, Prop, h } from '@stencil/core';
|
||||||
|
|
||||||
import { getIonMode } from '../../global/ionic-global';
|
import { getIonMode } from '../../global/ionic-global';
|
||||||
import type {
|
import type {
|
||||||
@ -9,8 +9,18 @@ import type {
|
|||||||
OverlayEventDetail,
|
OverlayEventDetail,
|
||||||
OverlayInterface,
|
OverlayInterface,
|
||||||
ToastButton,
|
ToastButton,
|
||||||
|
FrameworkDelegate,
|
||||||
} from '../../interface';
|
} from '../../interface';
|
||||||
import { dismiss, eventMethod, isCancel, prepareOverlay, present, safeCall } from '../../utils/overlays';
|
import {
|
||||||
|
createDelegateController,
|
||||||
|
createTriggerController,
|
||||||
|
dismiss,
|
||||||
|
eventMethod,
|
||||||
|
isCancel,
|
||||||
|
prepareOverlay,
|
||||||
|
present,
|
||||||
|
safeCall,
|
||||||
|
} from '../../utils/overlays';
|
||||||
import type { IonicSafeString } from '../../utils/sanitization';
|
import type { IonicSafeString } from '../../utils/sanitization';
|
||||||
import { sanitizeDOMString } from '../../utils/sanitization';
|
import { sanitizeDOMString } from '../../utils/sanitization';
|
||||||
import { createColorClasses, getClassMap } from '../../utils/theme';
|
import { createColorClasses, getClassMap } from '../../utils/theme';
|
||||||
@ -38,6 +48,9 @@ import { mdLeaveAnimation } from './animations/md.leave';
|
|||||||
shadow: true,
|
shadow: true,
|
||||||
})
|
})
|
||||||
export class Toast implements ComponentInterface, OverlayInterface {
|
export class Toast implements ComponentInterface, OverlayInterface {
|
||||||
|
private readonly delegateController = createDelegateController(this);
|
||||||
|
private readonly triggerController = createTriggerController();
|
||||||
|
private currentTransition?: Promise<any>;
|
||||||
private durationTimeout: any;
|
private durationTimeout: any;
|
||||||
|
|
||||||
presented = false;
|
presented = false;
|
||||||
@ -49,6 +62,12 @@ export class Toast implements ComponentInterface, OverlayInterface {
|
|||||||
*/
|
*/
|
||||||
@Prop() overlayIndex!: number;
|
@Prop() overlayIndex!: number;
|
||||||
|
|
||||||
|
/** @internal */
|
||||||
|
@Prop() delegate?: FrameworkDelegate;
|
||||||
|
|
||||||
|
/** @internal */
|
||||||
|
@Prop() hasController = false;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The color to use from your application's color palette.
|
* The color to use from your application's color palette.
|
||||||
* Default options are: `"primary"`, `"secondary"`, `"tertiary"`, `"success"`, `"warning"`, `"danger"`, `"light"`, `"medium"`, and `"dark"`.
|
* Default options are: `"primary"`, `"secondary"`, `"tertiary"`, `"success"`, `"warning"`, `"danger"`, `"light"`, `"medium"`, and `"dark"`.
|
||||||
@ -126,6 +145,36 @@ export class Toast implements ComponentInterface, OverlayInterface {
|
|||||||
*/
|
*/
|
||||||
@Prop() htmlAttributes?: { [key: string]: any };
|
@Prop() htmlAttributes?: { [key: string]: any };
|
||||||
|
|
||||||
|
/**
|
||||||
|
* If `true`, the toast will open. If `false`, the toast will close.
|
||||||
|
* Use this if you need finer grained control over presentation, otherwise
|
||||||
|
* just use the toastController or the `trigger` property.
|
||||||
|
* Note: `isOpen` will not automatically be set back to `false` when
|
||||||
|
* the toast dismisses. You will need to do that in your code.
|
||||||
|
*/
|
||||||
|
@Prop() isOpen = false;
|
||||||
|
@Watch('isOpen')
|
||||||
|
onIsOpenChange(newValue: boolean, oldValue: boolean) {
|
||||||
|
if (newValue === true && oldValue === false) {
|
||||||
|
this.present();
|
||||||
|
} else if (newValue === false && oldValue === true) {
|
||||||
|
this.dismiss();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* An ID corresponding to the trigger element that
|
||||||
|
* causes the toast to open when clicked.
|
||||||
|
*/
|
||||||
|
@Prop() trigger: string | undefined;
|
||||||
|
@Watch('trigger')
|
||||||
|
triggerChanged() {
|
||||||
|
const { trigger, el, triggerController } = this;
|
||||||
|
if (trigger) {
|
||||||
|
triggerController.addClickListener(el, trigger);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Emitted after the toast has presented.
|
* Emitted after the toast has presented.
|
||||||
*/
|
*/
|
||||||
@ -146,8 +195,37 @@ export class Toast implements ComponentInterface, OverlayInterface {
|
|||||||
*/
|
*/
|
||||||
@Event({ eventName: 'ionToastDidDismiss' }) didDismiss!: EventEmitter<OverlayEventDetail>;
|
@Event({ eventName: 'ionToastDidDismiss' }) didDismiss!: EventEmitter<OverlayEventDetail>;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Emitted after the toast has presented.
|
||||||
|
* Shorthand for ionToastWillDismiss.
|
||||||
|
*/
|
||||||
|
@Event({ eventName: 'didPresent' }) didPresentShorthand!: EventEmitter<void>;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Emitted before the toast has presented.
|
||||||
|
* Shorthand for ionToastWillPresent.
|
||||||
|
*/
|
||||||
|
@Event({ eventName: 'willPresent' }) willPresentShorthand!: EventEmitter<void>;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Emitted before the toast has dismissed.
|
||||||
|
* Shorthand for ionToastWillDismiss.
|
||||||
|
*/
|
||||||
|
@Event({ eventName: 'willDismiss' }) willDismissShorthand!: EventEmitter<OverlayEventDetail>;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Emitted after the toast has dismissed.
|
||||||
|
* Shorthand for ionToastDidDismiss.
|
||||||
|
*/
|
||||||
|
@Event({ eventName: 'didDismiss' }) didDismissShorthand!: EventEmitter<OverlayEventDetail>;
|
||||||
|
|
||||||
connectedCallback() {
|
connectedCallback() {
|
||||||
prepareOverlay(this.el);
|
prepareOverlay(this.el);
|
||||||
|
this.triggerChanged();
|
||||||
|
}
|
||||||
|
|
||||||
|
disconnectedCallback() {
|
||||||
|
this.triggerController.removeClickListener();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -155,7 +233,23 @@ export class Toast implements ComponentInterface, OverlayInterface {
|
|||||||
*/
|
*/
|
||||||
@Method()
|
@Method()
|
||||||
async present(): Promise<void> {
|
async present(): Promise<void> {
|
||||||
await present(this, 'toastEnter', iosEnterAnimation, mdEnterAnimation, this.position);
|
/**
|
||||||
|
* When using an inline toast
|
||||||
|
* and dismissing a toast it is possible to
|
||||||
|
* quickly present the toast while it is
|
||||||
|
* dismissing. We need to await any current
|
||||||
|
* transition to allow the dismiss to finish
|
||||||
|
* before presenting again.
|
||||||
|
*/
|
||||||
|
if (this.currentTransition !== undefined) {
|
||||||
|
await this.currentTransition;
|
||||||
|
}
|
||||||
|
|
||||||
|
await this.delegateController.attachViewToDom();
|
||||||
|
|
||||||
|
this.currentTransition = present(this, 'toastEnter', iosEnterAnimation, mdEnterAnimation, this.position);
|
||||||
|
await this.currentTransition;
|
||||||
|
this.currentTransition = undefined;
|
||||||
|
|
||||||
if (this.duration > 0) {
|
if (this.duration > 0) {
|
||||||
this.durationTimeout = setTimeout(() => this.dismiss(undefined, 'timeout'), this.duration);
|
this.durationTimeout = setTimeout(() => this.dismiss(undefined, 'timeout'), this.duration);
|
||||||
@ -172,11 +266,27 @@ export class Toast implements ComponentInterface, OverlayInterface {
|
|||||||
* Some examples include: ``"cancel"`, `"destructive"`, "selected"`, and `"backdrop"`.
|
* Some examples include: ``"cancel"`, `"destructive"`, "selected"`, and `"backdrop"`.
|
||||||
*/
|
*/
|
||||||
@Method()
|
@Method()
|
||||||
dismiss(data?: any, role?: string): Promise<boolean> {
|
async dismiss(data?: any, role?: string): Promise<boolean> {
|
||||||
if (this.durationTimeout) {
|
if (this.durationTimeout) {
|
||||||
clearTimeout(this.durationTimeout);
|
clearTimeout(this.durationTimeout);
|
||||||
}
|
}
|
||||||
return dismiss(this, data, role, 'toastLeave', iosLeaveAnimation, mdLeaveAnimation, this.position);
|
|
||||||
|
this.currentTransition = dismiss(
|
||||||
|
this,
|
||||||
|
data,
|
||||||
|
role,
|
||||||
|
'toastLeave',
|
||||||
|
iosLeaveAnimation,
|
||||||
|
mdLeaveAnimation,
|
||||||
|
this.position
|
||||||
|
);
|
||||||
|
const dismissed = await this.currentTransition;
|
||||||
|
|
||||||
|
if (dismissed) {
|
||||||
|
this.delegateController.removeViewFromDom();
|
||||||
|
}
|
||||||
|
|
||||||
|
return dismissed;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -1,11 +1,11 @@
|
|||||||
import {
|
import {
|
||||||
|
JSX,
|
||||||
ToastButton as ToastButtonCore,
|
ToastButton as ToastButtonCore,
|
||||||
ToastOptions as ToastOptionsCore,
|
ToastOptions as ToastOptionsCore
|
||||||
toastController as toastControllerCore,
|
|
||||||
} from '@ionic/core/components';
|
} from '@ionic/core/components';
|
||||||
import { defineCustomElement } from '@ionic/core/components/ion-toast.js';
|
import { defineCustomElement } from '@ionic/core/components/ion-toast.js';
|
||||||
|
|
||||||
import { createControllerComponent } from './createControllerComponent';
|
import { createInlineOverlayComponent } from './createInlineOverlayComponent';
|
||||||
|
|
||||||
export interface ToastButton extends Omit<ToastButtonCore, 'icon'> {
|
export interface ToastButton extends Omit<ToastButtonCore, 'icon'> {
|
||||||
icon?:
|
icon?:
|
||||||
@ -20,15 +20,7 @@ export interface ToastOptions extends Omit<ToastOptionsCore, 'buttons'> {
|
|||||||
buttons?: (ToastButton | string)[];
|
buttons?: (ToastButton | string)[];
|
||||||
}
|
}
|
||||||
|
|
||||||
const toastController = {
|
export const IonToast = /*@__PURE__*/ createInlineOverlayComponent<JSX.IonToast, HTMLIonToastElement>(
|
||||||
create: (options: ToastOptions) => toastControllerCore.create(options as any),
|
|
||||||
dismiss: (data?: any, role?: string | undefined, id?: string | undefined) =>
|
|
||||||
toastControllerCore.dismiss(data, role, id),
|
|
||||||
getTop: () => toastControllerCore.getTop(),
|
|
||||||
};
|
|
||||||
|
|
||||||
export const IonToast = /*@__PURE__*/ createControllerComponent<ToastOptions, HTMLIonToastElement>(
|
|
||||||
'ion-toast',
|
'ion-toast',
|
||||||
toastController,
|
|
||||||
defineCustomElement
|
defineCustomElement
|
||||||
);
|
);
|
||||||
|
@ -9,7 +9,7 @@ describe('IonToast', () => {
|
|||||||
cy.get('ion-toast');
|
cy.get('ion-toast');
|
||||||
cy.get('ion-toast').shadow().contains('Hello from a toast!');
|
cy.get('ion-toast').shadow().contains('Hello from a toast!');
|
||||||
cy.get('ion-toast').shadow().find('button').contains('hide').click();
|
cy.get('ion-toast').shadow().find('button').contains('hide').click();
|
||||||
cy.get('ion-toast').should('not.exist');
|
cy.get('ion-toast').should('not.be.visible');
|
||||||
});
|
});
|
||||||
|
|
||||||
it('display toast and call dismiss to close it', () => {
|
it('display toast and call dismiss to close it', () => {
|
||||||
@ -17,6 +17,6 @@ describe('IonToast', () => {
|
|||||||
cy.get('ion-button').contains('Show Toast, call dismiss in 250 ms').click();
|
cy.get('ion-button').contains('Show Toast, call dismiss in 250 ms').click();
|
||||||
cy.get('ion-toast');
|
cy.get('ion-toast');
|
||||||
cy.get('ion-toast').shadow().contains('Hello from a toast!');
|
cy.get('ion-toast').shadow().contains('Hello from a toast!');
|
||||||
cy.get('ion-toast').should('not.exist');
|
cy.get('ion-toast').should('not.be.visible');
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
@ -23,7 +23,6 @@ function generateOverlays() {
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
tag: 'ion-toast',
|
tag: 'ion-toast',
|
||||||
controller: 'toastController',
|
|
||||||
name: 'IonToast'
|
name: 'IonToast'
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
@ -7,7 +7,6 @@ import {
|
|||||||
JSX,
|
JSX,
|
||||||
alertController,
|
alertController,
|
||||||
pickerController,
|
pickerController,
|
||||||
toastController,
|
|
||||||
} from '@ionic/core/components';
|
} from '@ionic/core/components';
|
||||||
|
|
||||||
import { defineCustomElement as defineIonActionSheetCustomElement } from '@ionic/core/components/ion-action-sheet.js'
|
import { defineCustomElement as defineIonActionSheetCustomElement } from '@ionic/core/components/ion-action-sheet.js'
|
||||||
@ -28,7 +27,7 @@ export const IonLoading = /*@__PURE__*/ defineOverlayContainer<JSX.IonLoading>('
|
|||||||
|
|
||||||
export const IonPicker = /*@__PURE__*/ defineOverlayContainer<JSX.IonPicker>('ion-picker', defineIonPickerCustomElement, ['animated', 'backdropDismiss', 'buttons', 'columns', 'cssClass', 'duration', 'enterAnimation', 'htmlAttributes', 'keyboardClose', 'leaveAnimation', 'mode', 'showBackdrop'], pickerController);
|
export const IonPicker = /*@__PURE__*/ defineOverlayContainer<JSX.IonPicker>('ion-picker', defineIonPickerCustomElement, ['animated', 'backdropDismiss', 'buttons', 'columns', 'cssClass', 'duration', 'enterAnimation', 'htmlAttributes', 'keyboardClose', 'leaveAnimation', 'mode', 'showBackdrop'], pickerController);
|
||||||
|
|
||||||
export const IonToast = /*@__PURE__*/ defineOverlayContainer<JSX.IonToast>('ion-toast', defineIonToastCustomElement, ['animated', 'buttons', 'color', 'cssClass', 'duration', 'enterAnimation', 'header', 'htmlAttributes', 'icon', 'keyboardClose', 'leaveAnimation', 'message', 'mode', 'position', 'translucent'], toastController);
|
export const IonToast = /*@__PURE__*/ defineOverlayContainer<JSX.IonToast>('ion-toast', defineIonToastCustomElement, ['animated', 'buttons', 'color', 'cssClass', 'duration', 'enterAnimation', 'header', 'htmlAttributes', 'icon', 'isOpen', 'keyboardClose', 'leaveAnimation', 'message', 'mode', 'position', 'translucent', 'trigger']);
|
||||||
|
|
||||||
export const IonModal = /*@__PURE__*/ defineOverlayContainer<JSX.IonModal>('ion-modal', defineIonModalCustomElement, ['animated', 'backdropBreakpoint', 'backdropDismiss', 'breakpoints', 'canDismiss', 'enterAnimation', 'handle', 'handleBehavior', 'htmlAttributes', 'initialBreakpoint', 'isOpen', 'keepContentsMounted', 'keyboardClose', 'leaveAnimation', 'mode', 'presentingElement', 'showBackdrop', 'trigger']);
|
export const IonModal = /*@__PURE__*/ defineOverlayContainer<JSX.IonModal>('ion-modal', defineIonModalCustomElement, ['animated', 'backdropBreakpoint', 'backdropDismiss', 'breakpoints', 'canDismiss', 'enterAnimation', 'handle', 'handleBehavior', 'htmlAttributes', 'initialBreakpoint', 'isOpen', 'keepContentsMounted', 'keyboardClose', 'leaveAnimation', 'mode', 'presentingElement', 'showBackdrop', 'trigger']);
|
||||||
|
|
||||||
|
@ -86,11 +86,11 @@ describe('Overlays', () => {
|
|||||||
cy.get('ion-radio#controller').click();
|
cy.get('ion-radio#controller').click();
|
||||||
|
|
||||||
cy.get('ion-button#present-overlay').click();
|
cy.get('ion-button#present-overlay').click();
|
||||||
cy.get('ion-toast').should('exist');
|
cy.get('ion-toast.ion-toast-controller').should('exist');
|
||||||
|
|
||||||
cy.get('ion-toast').shadow().find('button').click();
|
cy.get('ion-toast.ion-toast-controller').shadow().find('button').click();
|
||||||
|
|
||||||
cy.get('ion-toast').should('not.exist');
|
cy.get('ion-toast.ion-toast-controller').should('not.exist');
|
||||||
});
|
});
|
||||||
|
|
||||||
it(`should open and close ion-alert via component`, () => {
|
it(`should open and close ion-alert via component`, () => {
|
||||||
@ -122,7 +122,7 @@ describe('Overlays', () => {
|
|||||||
|
|
||||||
cy.get('ion-toast').shadow().find('button').click();
|
cy.get('ion-toast').shadow().find('button').click();
|
||||||
|
|
||||||
cy.get('ion-toast').should('not.exist');
|
cy.get('ion-toast').should('not.be.visible');
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should pass props to modal via controller', () => {
|
it('should pass props to modal via controller', () => {
|
||||||
|
Reference in New Issue
Block a user