From 985a9697e89baa0ac291cf70a0876cc1df82c9c4 Mon Sep 17 00:00:00 2001
From: Liam DeBeasi <liamdebeasi@users.noreply.github.com>
Date: Mon, 13 Nov 2023 12:50:57 -0500
Subject: [PATCH 1/4] fix: fix some controllers

---
 .../angular/standalone/src/providers/action-sheet-controller.ts | 2 ++
 packages/angular/standalone/src/providers/modal-controller.ts   | 2 ++
 packages/angular/standalone/src/providers/popover-controller.ts | 2 ++
 packages/angular/standalone/src/providers/toast-controller.ts   | 2 ++
 4 files changed, 8 insertions(+)

diff --git a/packages/angular/standalone/src/providers/action-sheet-controller.ts b/packages/angular/standalone/src/providers/action-sheet-controller.ts
index 826d47e5aa5..24c2ce7ca60 100644
--- a/packages/angular/standalone/src/providers/action-sheet-controller.ts
+++ b/packages/angular/standalone/src/providers/action-sheet-controller.ts
@@ -2,6 +2,7 @@ import { Injectable } from '@angular/core';
 import { OverlayBaseController } from '@ionic/angular/common';
 import type { ActionSheetOptions } from '@ionic/core/components';
 import { actionSheetController } from '@ionic/core/components';
+import { defineCustomElement } from '@ionic/core/components/ion-action-sheet.js';
 
 @Injectable({
   providedIn: 'root',
@@ -9,5 +10,6 @@ import { actionSheetController } from '@ionic/core/components';
 export class ActionSheetController extends OverlayBaseController<ActionSheetOptions, HTMLIonActionSheetElement> {
   constructor() {
     super(actionSheetController);
+    defineCustomElement();
   }
 }
diff --git a/packages/angular/standalone/src/providers/modal-controller.ts b/packages/angular/standalone/src/providers/modal-controller.ts
index c2ca604412f..07e406ec5d6 100644
--- a/packages/angular/standalone/src/providers/modal-controller.ts
+++ b/packages/angular/standalone/src/providers/modal-controller.ts
@@ -2,6 +2,7 @@ import { Injector, Injectable, EnvironmentInjector, inject } from '@angular/core
 import { AngularDelegate, OverlayBaseController } from '@ionic/angular/common';
 import type { ModalOptions } from '@ionic/core/components';
 import { modalController } from '@ionic/core/components';
+import { defineCustomElement } from '@ionic/core/components/ion-modal.js';
 
 @Injectable()
 export class ModalController extends OverlayBaseController<ModalOptions, HTMLIonModalElement> {
@@ -11,6 +12,7 @@ export class ModalController extends OverlayBaseController<ModalOptions, HTMLIon
 
   constructor() {
     super(modalController);
+    defineCustomElement();
   }
 
   create(opts: ModalOptions): Promise<HTMLIonModalElement> {
diff --git a/packages/angular/standalone/src/providers/popover-controller.ts b/packages/angular/standalone/src/providers/popover-controller.ts
index 837c7f647ac..395b4dbdb70 100644
--- a/packages/angular/standalone/src/providers/popover-controller.ts
+++ b/packages/angular/standalone/src/providers/popover-controller.ts
@@ -2,6 +2,7 @@ import { Injector, inject, EnvironmentInjector } from '@angular/core';
 import { AngularDelegate, OverlayBaseController } from '@ionic/angular/common';
 import type { PopoverOptions } from '@ionic/core/components';
 import { popoverController } from '@ionic/core/components';
+import { defineCustomElement } from '@ionic/core/components/ion-popover.js';
 
 export class PopoverController extends OverlayBaseController<PopoverOptions, HTMLIonPopoverElement> {
   private angularDelegate = inject(AngularDelegate);
@@ -10,6 +11,7 @@ export class PopoverController extends OverlayBaseController<PopoverOptions, HTM
 
   constructor() {
     super(popoverController);
+    defineCustomElement();
   }
 
   create(opts: PopoverOptions): Promise<HTMLIonPopoverElement> {
diff --git a/packages/angular/standalone/src/providers/toast-controller.ts b/packages/angular/standalone/src/providers/toast-controller.ts
index 4e4be9637d5..e662a01f89c 100644
--- a/packages/angular/standalone/src/providers/toast-controller.ts
+++ b/packages/angular/standalone/src/providers/toast-controller.ts
@@ -2,6 +2,7 @@ import { Injectable } from '@angular/core';
 import { OverlayBaseController } from '@ionic/angular/common';
 import type { ToastOptions } from '@ionic/core/components';
 import { toastController } from '@ionic/core/components';
+import { defineCustomElement } from '@ionic/core/components/ion-toast.js';
 
 @Injectable({
   providedIn: 'root',
@@ -9,5 +10,6 @@ import { toastController } from '@ionic/core/components';
 export class ToastController extends OverlayBaseController<ToastOptions, HTMLIonToastElement> {
   constructor() {
     super(toastController);
+    defineCustomElement();
   }
 }

From a6b7f5af3ea7afc1d6defc66f12e86a8536e864b Mon Sep 17 00:00:00 2001
From: Liam DeBeasi <liamdebeasi@users.noreply.github.com>
Date: Thu, 16 Nov 2023 13:30:39 -0500
Subject: [PATCH 2/4] update alert

---
 packages/angular/standalone/src/providers/alert-controller.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/angular/standalone/src/providers/alert-controller.ts b/packages/angular/standalone/src/providers/alert-controller.ts
index 525d70ed270..c085a0f3047 100644
--- a/packages/angular/standalone/src/providers/alert-controller.ts
+++ b/packages/angular/standalone/src/providers/alert-controller.ts
@@ -2,6 +2,7 @@ import { Injectable } from '@angular/core';
 import { OverlayBaseController } from '@ionic/angular/common';
 import type { AlertOptions } from '@ionic/core/components';
 import { alertController } from '@ionic/core/components';
+import { defineCustomElement } from '@ionic/core/components/ion-alert.js';
 
 @Injectable({
   providedIn: 'root',
@@ -9,5 +10,6 @@ import { alertController } from '@ionic/core/components';
 export class AlertController extends OverlayBaseController<AlertOptions, HTMLIonAlertElement> {
   constructor() {
     super(alertController);
+    defineCustomElement();
   }
 }

From dc6e2e843a4fd1d2925cdd93524c2e4f3456a010 Mon Sep 17 00:00:00 2001
From: Liam DeBeasi <liamdebeasi@users.noreply.github.com>
Date: Thu, 16 Nov 2023 13:30:42 -0500
Subject: [PATCH 3/4] remove todo

---
 packages/angular/standalone/src/providers/picker-controller.ts | 2 --
 1 file changed, 2 deletions(-)

diff --git a/packages/angular/standalone/src/providers/picker-controller.ts b/packages/angular/standalone/src/providers/picker-controller.ts
index f3638ad6d47..188491c5bf7 100644
--- a/packages/angular/standalone/src/providers/picker-controller.ts
+++ b/packages/angular/standalone/src/providers/picker-controller.ts
@@ -10,8 +10,6 @@ import { defineCustomElement } from '@ionic/core/components/ion-picker.js';
 export class PickerController extends OverlayBaseController<PickerOptions, HTMLIonPickerElement> {
   constructor() {
     super(pickerController);
-
-    // TODO: FW-5415 may remove the need for this
     defineCustomElement();
   }
 }

From 581ed02196275f37bca792b4cb26675ca339b6bc Mon Sep 17 00:00:00 2001
From: Liam DeBeasi <liamdebeasi@users.noreply.github.com>
Date: Mon, 20 Nov 2023 09:57:26 -0500
Subject: [PATCH 4/4] remove comment

---
 packages/angular/standalone/src/providers/loading-controller.ts | 2 --
 1 file changed, 2 deletions(-)

diff --git a/packages/angular/standalone/src/providers/loading-controller.ts b/packages/angular/standalone/src/providers/loading-controller.ts
index 03785983bf9..0e766076c8a 100644
--- a/packages/angular/standalone/src/providers/loading-controller.ts
+++ b/packages/angular/standalone/src/providers/loading-controller.ts
@@ -10,8 +10,6 @@ import { defineCustomElement } from '@ionic/core/components/ion-loading.js';
 export class LoadingController extends OverlayBaseController<LoadingOptions, HTMLIonLoadingElement> {
   constructor() {
     super(loadingController);
-
-    // TODO: FW-5415 may remove the need for this
     defineCustomElement();
   }
 }