Merge remote-tracking branch 'origin/main' into sync-7-11-15-22

This commit is contained in:
Sean Perkins
2022-11-15 15:40:21 -05:00
437 changed files with 1449 additions and 1499 deletions

View File

@ -39,7 +39,6 @@ export const IonRouterOutlet = /*@__PURE__*/ defineComponent({
const ionRouterOutlet = ref();
const id = generateId('ion-router-outlet');
// TODO types
const ionRouter: any = inject('navManager');
const viewStacks: any = inject('viewStacks');
@ -143,7 +142,6 @@ export const IonRouterOutlet = /*@__PURE__*/ defineComponent({
const customAnimation = enteringViewItem.routerAnimation;
if (
animationBuilder === undefined &&
// todo check for tab switch
customAnimation !== undefined
) {
animationBuilder = customAnimation;
@ -198,7 +196,7 @@ export const IonRouterOutlet = /*@__PURE__*/ defineComponent({
const transition = async (
enteringEl: HTMLElement,
leavingEl: HTMLElement,
direction: any, // TODO types
direction: any,
showGoBack: boolean,
progressAnimation: boolean,
animationBuilder?: AnimationBuilder
@ -300,7 +298,6 @@ See https://ionicframework.com/docs/vue/navigation#ionpage for more information.
if (
animationBuilder === undefined &&
routerDirection === 'back' &&
// todo check for tab switch
customAnimation !== undefined
) {
animationBuilder = customAnimation;
@ -418,7 +415,6 @@ See https://ionicframework.com/docs/vue/navigation#ionpage for more information.
*/
onUnmounted(() => viewStacks.clear(id));
// TODO types
const registerIonPage = (viewItem: any, ionPageEl: HTMLElement) => {
const oldIonPageEl = viewItem.ionPageElement;
@ -464,7 +460,6 @@ See https://ionicframework.com/docs/vue/navigation#ionpage for more information.
return h(
'ion-router-outlet',
{ ref: 'ionRouterOutlet' },
// TODO types
components && components.map((c: any) => {
let props = {
ref: c.vueComponentRef,

View File

@ -25,7 +25,7 @@ export const IonicVue: Plugin = {
* By default Ionic Framework hides elements that
* are not hydrated, but in the CE build there is no
* hydration.
* TODO: Remove when all integrations have been
* TODO FW-2797: Remove when all integrations have been
* migrated to CE build.
*/
if (typeof (document as any) !== 'undefined') {

View File

@ -24,7 +24,6 @@ export const generateId = (type = 'main') => {
return (id).toString();
};
// TODO types
export const fireLifecycle = (vueComponent: any, vueInstance: Ref<ComponentPublicInstance>, lifecycle: LIFECYCLE_EVENTS) => {
if (vueComponent?.[lifecycle]) {
vueComponent[lifecycle].bind(vueInstance?.value)();