Revert "feat(toast): add global config toastDuration (#26401)" (#26424)

This reverts commit e375e9a1e7d30c481772e84c0ae34f39a019aad3.
This commit is contained in:
Amanda Johnston
2022-12-06 09:42:21 -06:00
committed by GitHub
parent e375e9a1e7
commit b6c001935b
4 changed files with 4 additions and 38 deletions

View File

@ -1382,7 +1382,7 @@ ion-toast,prop,animated,boolean,true,false,false
ion-toast,prop,buttons,(string | ToastButton)[] | undefined,undefined,false,false ion-toast,prop,buttons,(string | ToastButton)[] | undefined,undefined,false,false
ion-toast,prop,color,"danger" | "dark" | "light" | "medium" | "primary" | "secondary" | "success" | "tertiary" | "warning" | string & Record<never, never> | undefined,undefined,false,true ion-toast,prop,color,"danger" | "dark" | "light" | "medium" | "primary" | "secondary" | "success" | "tertiary" | "warning" | string & Record<never, never> | undefined,undefined,false,true
ion-toast,prop,cssClass,string | string[] | undefined,undefined,false,false ion-toast,prop,cssClass,string | string[] | undefined,undefined,false,false
ion-toast,prop,duration,number,config.getNumber('toastDuration', 0),false,false ion-toast,prop,duration,number,0,false,false
ion-toast,prop,enterAnimation,((baseEl: any, opts?: any) => Animation) | undefined,undefined,false,false ion-toast,prop,enterAnimation,((baseEl: any, opts?: any) => Animation) | undefined,undefined,false,false
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

View File

@ -1,5 +1,5 @@
import type { Locator, TestInfo } from '@playwright/test';
import { expect } from '@playwright/test'; import { expect } from '@playwright/test';
import type { Locator, TestInfo } from '@playwright/test';
import type { E2EPage, EventSpy } from '@utils/test/playwright'; import type { E2EPage, EventSpy } from '@utils/test/playwright';
import { test } from '@utils/test/playwright'; import { test } from '@utils/test/playwright';
@ -134,31 +134,3 @@ test.describe('toast: properties', () => {
await expect(toast).toHaveClass(/my-custom-class/); await expect(toast).toHaveClass(/my-custom-class/);
}); });
}); });
test.describe('toast: duration config', () => {
test.beforeEach(({ skip }) => {
skip.rtl();
skip.mode('ios');
});
test('should have duration set to 0', async ({ page }) => {
await page.setContent(`
<ion-toast></ion-toast>
`);
const toast = page.locator('ion-toast');
await expect(toast).toHaveJSProperty('duration', 0);
});
test('should have duration set to 5000', async ({ page }) => {
await page.setContent(`
<ion-toast></ion-toast>
<script>
window.Ionic = {
config: { toastDuration: 5000 }
}
</script>
`);
const toast = page.locator('ion-toast');
await expect(toast).toHaveJSProperty('duration', 5000);
});
});

View File

@ -1,7 +1,6 @@
import type { ComponentInterface, EventEmitter } from '@stencil/core'; import type { ComponentInterface, EventEmitter } from '@stencil/core';
import { Component, Element, Event, h, Host, Method, Prop } from '@stencil/core'; import { Component, Element, Event, Host, Method, Prop, h } from '@stencil/core';
import { config } from '../../global/config';
import { getIonMode } from '../../global/ionic-global'; import { getIonMode } from '../../global/ionic-global';
import type { import type {
AnimationBuilder, AnimationBuilder,
@ -78,7 +77,7 @@ export class Toast implements ComponentInterface, OverlayInterface {
* How many milliseconds to wait before hiding the toast. By default, it will show * How many milliseconds to wait before hiding the toast. By default, it will show
* until `dismiss()` is called. * until `dismiss()` is called.
*/ */
@Prop() duration = config.getNumber('toastDuration', 0); @Prop() duration = 0;
/** /**
* Header to be shown in the toast. * Header to be shown in the toast.

View File

@ -96,11 +96,6 @@ export interface IonicConfig {
*/ */
tabButtonLayout?: TabButtonLayout; tabButtonLayout?: TabButtonLayout;
/**
* Overrides the default `duration` for all `ion-toast` components.
*/
toastDuration?: number;
/** /**
* Overrides the default "animation" of all `ion-nav` and `ion-router-outlet` across the whole application. * Overrides the default "animation" of all `ion-nav` and `ion-router-outlet` across the whole application.
* This prop allows to replace the default transition and provide a custom one that applies to all navigation outlets. * This prop allows to replace the default transition and provide a custom one that applies to all navigation outlets.