chore(): sync with master

This commit is contained in:
Liam DeBeasi
2021-04-05 16:40:39 -04:00
81 changed files with 47583 additions and 2036 deletions

View File

@ -3,7 +3,7 @@
<ion-header>
<ion-toolbar>
<ion-buttons>
<ion-button @click="dismiss">Dismiss</ion-button>
<ion-button @click="dismiss" id="dismiss">Dismiss</ion-button>
</ion-buttons>
<ion-title>Modal</ion-title>
</ion-toolbar>

View File

@ -1,5 +1,5 @@
<template>
<ion-page>
<ion-page data-pageid="overlays">
<ion-header :translucent="true">
<ion-toolbar>
<ion-buttons>
@ -66,6 +66,13 @@
<ion-button @click="changeLoadingProps()" id="change-loading-props">Quickly Change Loading Props</ion-button>
<br /><br />
Modal onWillPresent: <div id="willPresent">{{ willPresent }}</div><br />
Modal onDidPresent: <div id="didPresent">{{ didPresent }}</div><br />
Modal onWillDismiss: <div id="willDismiss">{{ willDismiss }}</div><br />
Modal onDidDismiss: <div id="didDismiss">{{ didDismiss }}</div><br />
<ion-action-sheet
:is-open="isActionSheetOpen"
:buttons="actionSheetButtons"
@ -93,7 +100,10 @@
<ion-modal
:is-open="isModalOpen"
:componentProps="overlayProps"
@onDidDismiss="setModalRef(false)"
@onWillPresent="onModalWillPresent"
@onDidPresent="onModalDidPresent"
@onWillDismiss="onModalWillDismiss"
@onDidDismiss="onModalDidDismiss"
>
<ModalContent></ModalContent>
</ion-modal>
@ -326,7 +336,25 @@ export default defineComponent({
}, 10);
}
const willPresent = ref(0);
const didPresent = ref(0);
const willDismiss = ref(0);
const didDismiss = ref(0);
const onModalWillPresent = () => willPresent.value += 1;
const onModalDidPresent = () => { didPresent.value += 1; setModalRef(true); }
const onModalWillDismiss = () => willDismiss.value += 1;
const onModalDidDismiss = () => { didDismiss.value += 1; setModalRef(false); }
return {
onModalWillPresent,
onModalDidPresent,
onModalWillDismiss,
onModalDidDismiss,
willPresent,
didPresent,
willDismiss,
didDismiss,
changeLoadingProps,
overlayProps,
present,