From 368a28b5d80c7a2369554e9fca6696daa91d0646 Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@abv.bg>
Date: Wed, 17 Dec 2025 15:42:59 +0200
Subject: [PATCH] fix(multiple): type issues when importing Aria directives

Similar fix to #32522 that aims to capture the remaining host directives.

Related to https://github.com/angular/angular/issues/66069.
---
 src/aria/accordion/public-api.ts |  5 ++++-
 src/aria/combobox/public-api.ts  |  5 ++++-
 src/aria/listbox/public-api.ts   | 10 ++++++++++
 src/aria/menu/public-api.ts      |  5 ++++-
 src/aria/tabs/public-api.ts      |  5 ++++-
 src/aria/tree/public-api.ts      |  7 +++++++
 6 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/src/aria/accordion/public-api.ts b/src/aria/accordion/public-api.ts
index 8f2c83525069..73d592f44124 100644
--- a/src/aria/accordion/public-api.ts
+++ b/src/aria/accordion/public-api.ts
@@ -13,4 +13,7 @@ export {AccordionContent} from './accordion-content';
 
 // This needs to be re-exported, because it's used by the accordion components.
 // See: https://github.com/angular/components/issues/30663.
-export {DeferredContent as ɵɵDeferredContent} from '../private';
+export {
+  DeferredContent as ɵɵDeferredContent,
+  DeferredContentAware as ɵɵDeferredContentAware,
+} from '../private';
diff --git a/src/aria/combobox/public-api.ts b/src/aria/combobox/public-api.ts
index 5b55a45e66b8..b8ea7ceefa50 100644
--- a/src/aria/combobox/public-api.ts
+++ b/src/aria/combobox/public-api.ts
@@ -14,4 +14,7 @@ export {ComboboxPopupContainer} from './combobox-popup-container';
 
 // This needs to be re-exported, because it's used by the combobox components.
 // See: https://github.com/angular/components/issues/30663.
-export {DeferredContent as ɵɵDeferredContent} from '../private';
+export {
+  DeferredContent as ɵɵDeferredContent,
+  DeferredContentAware as ɵɵDeferredContentAware,
+} from '../private';
diff --git a/src/aria/listbox/public-api.ts b/src/aria/listbox/public-api.ts
index d601e9cbfe33..b91aa4aeb6be 100644
--- a/src/aria/listbox/public-api.ts
+++ b/src/aria/listbox/public-api.ts
@@ -8,3 +8,13 @@
 
 export {Listbox} from './listbox';
 export {Option} from './option';
+
+// This needs to be re-exported, because it's used by the listbox components.
+// See: https://github.com/angular/components/issues/30663.
+export {
+  Combobox as ɵɵCombobox,
+  ComboboxDialog as ɵɵComboboxDialog,
+  ComboboxInput as ɵɵComboboxInput,
+  ComboboxPopup as ɵɵComboboxPopup,
+  ComboboxPopupContainer as ɵɵComboboxPopupContainer,
+} from '../combobox';
diff --git a/src/aria/menu/public-api.ts b/src/aria/menu/public-api.ts
index a92a1ead012d..98239182ce61 100644
--- a/src/aria/menu/public-api.ts
+++ b/src/aria/menu/public-api.ts
@@ -14,4 +14,7 @@ export {MenuContent} from './menu-content';
 
 // This needs to be re-exported, because it's used by the menu components.
 // See: https://github.com/angular/components/issues/30663.
-export {DeferredContent as ɵɵDeferredContent} from '../private';
+export {
+  DeferredContent as ɵɵDeferredContent,
+  DeferredContentAware as ɵɵDeferredContentAware,
+} from '../private';
diff --git a/src/aria/tabs/public-api.ts b/src/aria/tabs/public-api.ts
index 6dfbe8827703..301245ea153e 100644
--- a/src/aria/tabs/public-api.ts
+++ b/src/aria/tabs/public-api.ts
@@ -14,4 +14,7 @@ export {TabContent} from './tab-content';
 
 // This needs to be re-exported, because it's used by the tab components.
 // See: https://github.com/angular/components/issues/30663.
-export {DeferredContent as ɵɵDeferredContent} from '../private';
+export {
+  DeferredContent as ɵɵDeferredContent,
+  DeferredContentAware as ɵɵDeferredContentAware,
+} from '../private';
diff --git a/src/aria/tree/public-api.ts b/src/aria/tree/public-api.ts
index 06449fda7530..a072a42a53d9 100644
--- a/src/aria/tree/public-api.ts
+++ b/src/aria/tree/public-api.ts
@@ -13,3 +13,10 @@ export {TreeItemGroup} from './tree-item-group';
 // This needs to be re-exported, because it's used by the tree components.
 // See: https://github.com/angular/components/issues/30663.
 export {DeferredContent as ɵɵDeferredContent} from '../private';
+export {
+  Combobox as ɵɵCombobox,
+  ComboboxDialog as ɵɵComboboxDialog,
+  ComboboxInput as ɵɵComboboxInput,
+  ComboboxPopup as ɵɵComboboxPopup,
+  ComboboxPopupContainer as ɵɵComboboxPopupContainer,
+} from '../combobox';