From 4715b83abb30ec5930710d16e5bfe8fc88a940ce Mon Sep 17 00:00:00 2001 From: Sean Perkins Date: Fri, 17 Dec 2021 13:48:17 -0500 Subject: [PATCH] fix(overlays): define custom element children (#24439) Closes #24393 --- core/src/utils/overlays.ts | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/core/src/utils/overlays.ts b/core/src/utils/overlays.ts index 13b83b913e..bfbf81575a 100644 --- a/core/src/utils/overlays.ts +++ b/core/src/utils/overlays.ts @@ -1,10 +1,13 @@ import { ActionSheet } from '../components/action-sheet/action-sheet'; import { Alert } from '../components/alert/alert'; +import { Backdrop } from '../components/backdrop/backdrop'; import { Loading } from '../components/loading/loading'; import { Modal } from '../components/modal/modal'; import { PickerColumnCmp } from '../components/picker-column/picker-column'; import { Picker } from '../components/picker/picker'; import { Popover } from '../components/popover/popover'; +import { RippleEffect } from '../components/ripple-effect/ripple-effect'; +import { Spinner } from '../components/spinner/spinner'; import { Toast } from '../components/toast/toast'; import { config } from '../global/config'; import { getIonMode } from '../global/ionic-global'; @@ -36,13 +39,13 @@ const createController = (tagName: str }; }; -export const alertController = /*@__PURE__*/createController('ion-alert', Alert); -export const actionSheetController = /*@__PURE__*/createController('ion-action-sheet', ActionSheet); -export const loadingController = /*@__PURE__*/createController('ion-loading', Loading); -export const modalController = /*@__PURE__*/createController('ion-modal', Modal); -export const pickerController = /*@__PURE__*/createController('ion-picker', Picker, [{ tagName: 'ion-picker-column', customElement: PickerColumnCmp }]); -export const popoverController = /*@__PURE__*/createController('ion-popover', Popover); -export const toastController = /*@__PURE__*/createController('ion-toast', Toast); +export const alertController = /*@__PURE__*/createController('ion-alert', Alert, [{ tagName: 'ion-backdrop', customElement: Backdrop }]); +export const actionSheetController = /*@__PURE__*/createController('ion-action-sheet', ActionSheet, [{ tagName: 'ion-backdrop', customElement: Backdrop }, { tagName: 'ion-ripple-effect', customElement: RippleEffect }]); +export const loadingController = /*@__PURE__*/createController('ion-loading', Loading, [{ tagName: 'ion-backdrop', customElement: Backdrop }, { tagName: 'ion-spinner', customElement: Spinner }]); +export const modalController = /*@__PURE__*/createController('ion-modal', Modal, [{ tagName: 'ion-backdrop', customElement: Backdrop }]); +export const pickerController = /*@__PURE__*/createController('ion-picker', Picker, [{ tagName: 'ion-picker-column', customElement: PickerColumnCmp }, { tagName: 'ion-backdrop', customElement: Backdrop }]); +export const popoverController = /*@__PURE__*/createController('ion-popover', Popover, [{ tagName: 'ion-backdrop', customElement: Backdrop }]); +export const toastController = /*@__PURE__*/createController('ion-toast', Toast, [{ tagName: 'ion-ripple-effect', customElement: RippleEffect }]); export const prepareOverlay = (el: T) => { /* tslint:disable-next-line */