@angular/aria 22.0.0-next.7 → 22.0.0-next.8

package/types/private.d.ts

@@ -1,18 +1,13 @@
-import { ComboboxPattern, ComboboxListboxControls, ComboboxTreeControls } from './_combobox-chunk.js';
-export { ComboboxDialogPattern, ComboboxInputs } from './_combobox-chunk.js';
-import { ListboxInputs, OptionPattern, ListboxPattern } from './_listbox-chunk.js';
-export { OptionInputs } from './_listbox-chunk.js';
-import { SignalLike, WritableSignalLike } from './_signal-like-chunk.js';
-export { computed, convertGetterSetterToWritableSignalLike, linkedSignal, signal } from './_signal-like-chunk.js';
+export { ListboxInputs, ListboxPattern, OptionInputs, OptionPattern } from './_listbox-chunk.js';
 export { MenuBarInputs, MenuBarPattern, MenuInputs, MenuItemInputs, MenuItemPattern, MenuPattern, MenuTriggerInputs, MenuTriggerPattern } from './_menu-chunk.js';
+import { SignalLike, WritableSignalLike } from './_collection-chunk.js';
+export { HasElement, SortedCollection, computed, convertGetterSetterToWritableSignalLike, linkedSignal, signal, sortDirectives } from './_collection-chunk.js';
 export { TabInputs, TabListInputs, TabListPattern, TabPanelInputs, TabPanelPattern, TabPattern } from './_tabs-chunk.js';
 export { ToolbarInputs, ToolbarPattern, ToolbarWidgetGroupInputs, ToolbarWidgetGroupPattern, ToolbarWidgetInputs, ToolbarWidgetPattern } from './_toolbar-chunk.js';
 export { AccordionGroupInputs, AccordionGroupPattern, AccordionTriggerInputs, AccordionTriggerPattern } from './_accordion-chunk.js';
-import { TreeInputs, TreeItemPattern, TreePattern } from './_tree-chunk.js';
-export { TreeItemInputs } from './_tree-chunk.js';
+export { TreeInputs, TreeItemInputs, TreeItemPattern, TreePattern } from './_tree-chunk.js';
 export { ElementResolver, GridCellInputs, GridCellPattern, GridCellWidgetInputs, GridCellWidgetPattern, GridInputs, GridPattern, GridRowInputs, GridRowPattern, resolveElement } from './_grid-chunk.js';
 export { DeferredContent, DeferredContentAware } from './_deferred-content-chunk.js';
-export { HasElement, sortDirectives } from './_element-chunk.js';
 import * as _angular_core from '@angular/core';
 import { KeyboardEventManager } from './_keyboard-event-manager-chunk.js';
 import { ClickEventManager } from './_click-event-manager-chunk.js';
@@ -21,127 +16,14 @@ export { untracked } from '@angular/core/primitives/signals';
 import './_list-chunk.js';
 import './_list-navigation-chunk.js';
 
-type ComboboxListboxInputs<V> = ListboxInputs<V> & {
-    /** The combobox controlling the listbox. */
-    combobox: SignalLike<ComboboxPattern<OptionPattern<V>, V> | undefined>;
-};
-declare class ComboboxListboxPattern<V> extends ListboxPattern<V> implements ComboboxListboxControls<OptionPattern<V>, V> {
-    readonly inputs: ComboboxListboxInputs<V>;
-    /** A unique identifier for the popup. */
-    readonly id: SignalLike<string>;
-    /** The ARIA role for the listbox. */
-    readonly role: SignalLike<"listbox">;
-    /** The id of the active (focused) item in the listbox. */
-    readonly activeId: SignalLike<string | undefined>;
-    /** The list of options in the listbox. */
-    readonly items: SignalLike<OptionPattern<V>[]>;
-    /** The tab index for the listbox. Always -1 because the combobox handles focus. */
-    tabIndex: SignalLike<-1 | 0>;
-    /** Whether multiple items in the list can be selected at once. */
-    multi: SignalLike<boolean>;
-    constructor(inputs: ComboboxListboxInputs<V>);
-    /** Noop. The combobox handles keydown events. */
-    onKeydown(_: KeyboardEvent): void;
-    /** Noop. The combobox handles pointerdown events. */
-    onClick(_: PointerEvent): void;
-    /** Noop. The combobox controls the open state. */
-    setDefaultState(): void;
-    /** Navigates to the specified item in the listbox. */
-    readonly focus: (item: OptionPattern<V>, opts?: {
-        focusElement?: boolean;
-    }) => void;
-    /** Navigates to the previous focusable item in the listbox. */
-    readonly getActiveItem: () => OptionPattern<V> | undefined;
-    /** Navigates to the next focusable item in the listbox. */
-    readonly next: () => void;
-    /** Navigates to the previous focusable item in the listbox. */
-    readonly prev: () => void;
-    /** Navigates to the last focusable item in the listbox. */
-    readonly last: () => void;
-    /** Navigates to the first focusable item in the listbox. */
-    readonly first: () => void;
-    /** Unfocuses the currently focused item in the listbox. */
-    readonly unfocus: () => void;
-    /** Selects the specified item in the listbox. */
-    readonly select: (item?: OptionPattern<V>) => void;
-    /** Toggles the selection state of the given item in the listbox. */
-    readonly toggle: (item?: OptionPattern<V>) => void;
-    /** Clears the selection in the listbox. */
-    readonly clearSelection: () => void;
-    /** Retrieves the OptionPattern associated with a pointer event. */
-    readonly getItem: (e: PointerEvent) => OptionPattern<V> | undefined;
-    /** Retrieves the currently selected items in the listbox. */
-    readonly getSelectedItems: () => OptionPattern<V>[];
-    /** Sets the value of the combobox listbox. */
-    readonly setValue: (value: V | undefined) => void;
-}
-
-type ComboboxTreeInputs<V> = TreeInputs<V> & {
-    /** The combobox controlling the tree. */
-    combobox: SignalLike<ComboboxPattern<TreeItemPattern<V>, V> | undefined>;
-};
-declare class ComboboxTreePattern<V> extends TreePattern<V> implements ComboboxTreeControls<TreeItemPattern<V>, V> {
-    readonly inputs: ComboboxTreeInputs<V>;
-    /** Toggles to expand or collapse a tree item. */
-    readonly toggleExpansion: (item?: TreeItemPattern<V>) => void;
-    /** Whether the currently focused item is collapsible. */
-    readonly isItemCollapsible: () => boolean;
-    /** The ARIA role for the tree. */
-    readonly role: () => "tree";
-    readonly activeId: SignalLike<string | undefined>;
-    /** Returns the currently active (focused) item in the tree. */
-    readonly getActiveItem: () => TreeItemPattern<V> | undefined;
-    /** The list of items in the tree. */
-    items: SignalLike<TreeItemPattern<V>[]>;
-    /** The tab index for the tree. Always -1 because the combobox handles focus. */
-    readonly tabIndex: SignalLike<-1 | 0>;
-    constructor(inputs: ComboboxTreeInputs<V>);
-    /** Noop. The combobox handles keydown events. */
-    onKeydown(_: KeyboardEvent): void;
-    /** Noop. The combobox handles click events. */
-    onClick(_: PointerEvent): void;
-    /** Noop. The combobox controls the open state. */
-    setDefaultState(): void;
-    /** Navigates to the specified item in the tree. */
-    readonly focus: (item: TreeItemPattern<V>) => void;
-    /** Navigates to the next focusable item in the tree. */
-    readonly next: () => void;
-    /** Navigates to the previous focusable item in the tree. */
-    readonly prev: () => void;
-    /** Navigates to the last focusable item in the tree. */
-    readonly last: () => void;
-    /** Navigates to the first focusable item in the tree. */
-    readonly first: () => void;
-    /** Unfocuses the currently focused item in the tree. */
-    readonly unfocus: () => void;
-    /** Selects the specified item in the tree or the current active item if not provided. */
-    readonly select: (item?: TreeItemPattern<V>) => void;
-    /** Toggles the selection state of the given item in the tree or the current active item if not provided. */
-    readonly toggle: (item?: TreeItemPattern<V>) => void;
-    /** Clears the selection in the tree. */
-    readonly clearSelection: () => void;
-    /** Retrieves the TreeItemPattern associated with a pointer event. */
-    readonly getItem: (e: PointerEvent) => TreeItemPattern<V> | undefined;
-    /** Retrieves the currently selected items in the tree */
-    readonly getSelectedItems: () => TreeItemPattern<V>[];
-    /** Sets the value of the combobox tree. */
-    readonly setValue: (value: V | undefined) => void;
-    /** Expands the currently focused item if it is expandable, or navigates to the first child. */
-    readonly expandItem: () => void;
-    /** Collapses the currently focused item if it is expandable, or navigates to the parent. */
-    readonly collapseItem: () => void;
-    /** Whether the specified item or the currently active item is expandable. */
-    isItemExpandable(item?: TreeItemPattern<V> | undefined): boolean;
-    /** Expands all of the tree items. */
-    readonly expandAll: () => void;
-    /** Collapses all of the tree items. */
-    readonly collapseAll: () => void;
-    /** Whether the currently active item is selectable. */
-    readonly isItemSelectable: (item?: TreeItemPattern<V> | undefined) => boolean;
-}
+/**
+ * Transform function for tabIndex inputs.
+ * Returns undefined if the value is undefined, otherwise converts it to a number.
+ */
+declare function tabIndexTransform(v: string | number | undefined): number | undefined;
 
 /** Represents the required inputs for a simple combobox. */
-interface SimpleComboboxInputs extends ExpansionItem {
+interface ComboboxInputs extends ExpansionItem {
     /** Whether the combobox should always remain expanded. */
     alwaysExpanded: SignalLike<boolean>;
     /** The value of the combobox. */
@@ -149,15 +31,17 @@ interface SimpleComboboxInputs extends ExpansionItem {
     /** The element that the combobox is attached to. */
     element: SignalLike<HTMLElement>;
     /** The popup associated with the combobox. */
-    popup: SignalLike<SimpleComboboxPopupPattern | undefined>;
+    popup: SignalLike<ComboboxPopupPattern | undefined>;
     /** An inline suggestion to be displayed in the input. */
     inlineSuggestion: SignalLike<string | undefined>;
     /** Whether the combobox is disabled. */
     disabled: SignalLike<boolean>;
+    /** Whether the combobox is soft disabled. */
+    softDisabled?: SignalLike<boolean>;
 }
 /** Controls the state of a simple combobox. */
-declare class SimpleComboboxPattern {
-    readonly inputs: SimpleComboboxInputs;
+declare class ComboboxPattern {
+    readonly inputs: ComboboxInputs;
     /** The expanded state of the combobox. */
     readonly isExpanded: _angular_core.Signal<boolean>;
     /** The value of the combobox. */
@@ -166,6 +50,8 @@ declare class SimpleComboboxPattern {
     readonly element: () => HTMLElement;
     /** Whether the combobox is disabled. */
     readonly disabled: () => boolean;
+    /** Whether the combobox is soft disabled. */
+    readonly softDisabled: () => boolean;
     /** An inline suggestion to be displayed in the input. */
     readonly inlineSuggestion: () => string | undefined;
     /** The ID of the active descendant in the popup. */
@@ -188,7 +74,7 @@ declare class SimpleComboboxPattern {
     keydown: _angular_core.Signal<KeyboardEventManager<KeyboardEvent>>;
     /** The click event manager for the combobox. */
     click: _angular_core.Signal<ClickEventManager<PointerEvent>>;
-    constructor(inputs: SimpleComboboxInputs);
+    constructor(inputs: ComboboxInputs);
     /** Handles keydown events for the combobox. */
     onKeydown(event: KeyboardEvent): void;
     /** Handles click events for the combobox. */
@@ -207,7 +93,7 @@ declare class SimpleComboboxPattern {
     closePopupOnBlurEffect(): void;
 }
 /** Represents the required inputs for a simple combobox popup. */
-interface SimpleComboboxPopupInputs {
+interface ComboboxPopupInputs {
     /** The type of the popup. */
     popupType: SignalLike<'listbox' | 'tree' | 'grid' | 'dialog'>;
     /** The element that serves as the control target for the popup. */
@@ -218,8 +104,8 @@ interface SimpleComboboxPopupInputs {
     popupId: SignalLike<string | undefined>;
 }
 /** Controls the state of a simple combobox popup. */
-declare class SimpleComboboxPopupPattern {
-    readonly inputs: SimpleComboboxPopupInputs;
+declare class ComboboxPopupPattern {
+    readonly inputs: ComboboxPopupInputs;
     /** The type of the popup. */
     readonly popupType: () => "listbox" | "tree" | "grid" | "dialog";
     /** The element that serves as the control target for the popup. */
@@ -230,12 +116,12 @@ declare class SimpleComboboxPopupPattern {
     readonly popupId: () => string | undefined;
     /** Whether the popup is focused. */
     readonly isFocused: _angular_core.WritableSignal<boolean>;
-    constructor(inputs: SimpleComboboxPopupInputs);
+    constructor(inputs: ComboboxPopupInputs);
     /** Handles focus in events for the popup. */
     onFocusin(): void;
     /** Handles focus out events for the popup. */
     onFocusout(event: FocusEvent): void;
 }
 
-export { ComboboxListboxControls, ComboboxListboxPattern, ComboboxPattern, ComboboxTreeControls, ComboboxTreePattern, ListboxInputs, ListboxPattern, OptionPattern, SignalLike, SimpleComboboxPattern, SimpleComboboxPopupPattern, TreeInputs, TreeItemPattern, TreePattern, WritableSignalLike };
-export type { ComboboxListboxInputs, ComboboxTreeInputs, SimpleComboboxInputs, SimpleComboboxPopupInputs };
+export { ComboboxPattern, ComboboxPopupPattern, SignalLike, WritableSignalLike, tabIndexTransform };
+export type { ComboboxInputs, ComboboxPopupInputs };

package/types/tabs.d.ts

@@ -1,60 +1,14 @@
-import * as _angular_cdk_bidi from '@angular/cdk/bidi';
 import * as _angular_core from '@angular/core';
 import { OnInit, OnDestroy, WritableSignal } from '@angular/core';
-import { TabPattern, TabPanelPattern, TabListPattern } from './_tabs-chunk.js';
+import * as _angular_cdk_bidi from '@angular/cdk/bidi';
+import { TabPattern, TabListPattern, TabPanelPattern } from './_tabs-chunk.js';
+import { HasElement, SortedCollection } from './_collection-chunk.js';
 import { DeferredContentAware, DeferredContent } from './_deferred-content-chunk.js';
-import { HasElement } from './_element-chunk.js';
 import './_keyboard-event-manager-chunk.js';
-import './_signal-like-chunk.js';
 import './_click-event-manager-chunk.js';
 import './_expansion-chunk.js';
 import './_list-navigation-chunk.js';
 
-/**
- * A TabPanel container for the resources of layered content associated with a tab.
- *
- * The `ngTabPanel` directive holds the content for a specific tab. It is linked to an
- * `ngTab` by a matching `value`. If a tab panel is hidden, the `inert` attribute will be
- * applied to remove it from the accessibility tree. Proper styling is required for visual hiding.
- *
- * ```html
- * <div ngTabPanel value="myTabId">
- *   <ng-template ngTabContent>
- *     <!-- Content for the tab panel -->
- *   </ng-template>
- * </div>
- * ```
- *
- * @developerPreview 21.0
- *
- * @see [Tabs](guide/aria/tabs)
- */
-declare class TabPanel implements OnInit, OnDestroy {
-    /** A reference to the host element. */
-    private readonly _elementRef;
-    /** A reference to the host element. */
-    readonly element: HTMLElement;
-    /** The DeferredContentAware host directive. */
-    private readonly _deferredContentAware;
-    /** The parent Tabs. */
-    private readonly _tabs;
-    /** A global unique identifier for the tab. */
-    readonly id: _angular_core.InputSignal<string>;
-    /** The Tab UIPattern associated with the tabpanel */
-    readonly _tabPattern: WritableSignal<TabPattern | undefined>;
-    /** A local unique identifier for the tabpanel. */
-    readonly value: _angular_core.InputSignal<string>;
-    /** Whether the tab panel is visible. */
-    readonly visible: _angular_core.Signal<boolean>;
-    /** The TabPanel UIPattern. */
-    readonly _pattern: TabPanelPattern;
-    constructor();
-    ngOnInit(): void;
-    ngOnDestroy(): void;
-    static ɵfac: _angular_core.ɵɵFactoryDeclaration<TabPanel, never>;
-    static ɵdir: _angular_core.ɵɵDirectiveDeclaration<TabPanel, "[ngTabPanel]", ["ngTabPanel"], { "id": { "alias": "id"; "required": false; "isSignal": true; }; "value": { "alias": "value"; "required": true; "isSignal": true; }; }, {}, never, never, true, [{ directive: typeof DeferredContentAware; inputs: { "preserveContent": "preserveContent"; }; outputs: {}; }]>;
-}
-
 /**
  * A selectable tab in a TabList.
  *
@@ -76,14 +30,12 @@ declare class Tab implements HasElement, OnInit, OnDestroy {
     private readonly _elementRef;
     /** A reference to the host element. */
     readonly element: HTMLElement;
-    /** The parent Tabs wrapper. */
-    private readonly _tabsWrapper;
     /** The parent TabList. */
     private readonly _tabList;
     /** A unique identifier for the widget. */
     readonly id: _angular_core.InputSignal<string>;
-    /** The panel associated with this tab. */
-    readonly panel: _angular_core.Signal<TabPanel | undefined>;
+    /** The TabPanel UIPattern associated with the tab */
+    private readonly _tabpanelPattern;
     /** Whether a tab is disabled. */
     readonly disabled: _angular_core.InputSignalWithTransform<boolean, unknown>;
     /** The remote tabpanel unique identifier. */
@@ -126,13 +78,11 @@ declare class TabList implements OnInit, OnDestroy {
     /** A reference to the host element. */
     readonly element: HTMLElement;
     /** The parent Tabs container. */
-    private readonly _tabsParent;
-    /** The Tabs registered for this TabList. */
-    private readonly _tabs;
-    /** The Tabs registered for this TabList. */
-    readonly _sortedTabs: _angular_core.Signal<Tab[]>;
+    readonly _tabsParent: Tabs;
+    /** The collection of Tabs. */
+    readonly _collection: SortedCollection<Tab>;
     /** The Tab UIPatterns of the child Tabs. */
-    private readonly _tabPatterns;
+    readonly _tabPatterns: _angular_core.Signal<TabPattern[]>;
     /** Whether the tablist is vertically or horizontally oriented. */
     readonly orientation: _angular_core.InputSignal<"vertical" | "horizontal">;
     /** Text direction. */
@@ -167,8 +117,6 @@ declare class TabList implements OnInit, OnDestroy {
     constructor();
     ngOnInit(): void;
     ngOnDestroy(): void;
-    _registerTab(child: Tab): void;
-    _unregisterTab(child: Tab): void;
     /** Opens the tab panel with the specified value. */
     open(value: string): boolean;
     findTab(value?: string): Tab | undefined;
@@ -176,6 +124,51 @@ declare class TabList implements OnInit, OnDestroy {
     static ɵdir: _angular_core.ɵɵDirectiveDeclaration<TabList, "[ngTabList]", ["ngTabList"], { "orientation": { "alias": "orientation"; "required": false; "isSignal": true; }; "wrap": { "alias": "wrap"; "required": false; "isSignal": true; }; "softDisabled": { "alias": "softDisabled"; "required": false; "isSignal": true; }; "focusMode": { "alias": "focusMode"; "required": false; "isSignal": true; }; "selectionMode": { "alias": "selectionMode"; "required": false; "isSignal": true; }; "selectedTab": { "alias": "selectedTab"; "required": false; "isSignal": true; }; "disabled": { "alias": "disabled"; "required": false; "isSignal": true; }; }, { "selectedTab": "selectedTabChange"; }, never, never, true, never>;
 }
 
+/**
+ * A TabPanel container for the resources of layered content associated with a tab.
+ *
+ * The `ngTabPanel` directive holds the content for a specific tab. It is linked to an
+ * `ngTab` by a matching `value`. If a tab panel is hidden, the `inert` attribute will be
+ * applied to remove it from the accessibility tree. Proper styling is required for visual hiding.
+ *
+ * ```html
+ * <div ngTabPanel value="myTabId">
+ *   <ng-template ngTabContent>
+ *     <!-- Content for the tab panel -->
+ *   </ng-template>
+ * </div>
+ * ```
+ *
+ * @developerPreview 21.0
+ *
+ * @see [Tabs](guide/aria/tabs)
+ */
+declare class TabPanel implements OnInit, OnDestroy {
+    /** A reference to the host element. */
+    private readonly _elementRef;
+    /** A reference to the host element. */
+    readonly element: HTMLElement;
+    /** The DeferredContentAware host directive. */
+    private readonly _deferredContentAware;
+    /** The parent Tabs. */
+    private readonly _tabs;
+    /** A global unique identifier for the tab. */
+    readonly id: _angular_core.InputSignal<string>;
+    /** The Tab UIPattern associated with the tabpanel */
+    private readonly _tabPattern;
+    /** A local unique identifier for the tabpanel. */
+    readonly value: _angular_core.InputSignal<string>;
+    /** Whether the tab panel is visible. */
+    readonly visible: _angular_core.Signal<boolean>;
+    /** The TabPanel UIPattern. */
+    readonly _pattern: TabPanelPattern;
+    constructor();
+    ngOnInit(): void;
+    ngOnDestroy(): void;
+    static ɵfac: _angular_core.ɵɵFactoryDeclaration<TabPanel, never>;
+    static ɵdir: _angular_core.ɵɵDirectiveDeclaration<TabPanel, "[ngTabPanel]", ["ngTabPanel"], { "id": { "alias": "id"; "required": false; "isSignal": true; }; "value": { "alias": "value"; "required": true; "isSignal": true; }; }, {}, never, never, true, [{ directive: typeof DeferredContentAware; inputs: { "preserveContent": "preserveContent"; }; outputs: {}; }]>;
+}
+
 /**
  * A Tabs container.
  *
@@ -207,23 +200,27 @@ declare class TabList implements OnInit, OnDestroy {
  *
  * @see [Tabs](guide/aria/tabs)
  */
-declare class Tabs {
+declare class Tabs implements OnDestroy {
     /** A reference to the host element. */
     private readonly _elementRef;
     /** A reference to the host element. */
     readonly element: HTMLElement;
     /** The TabList registered for this container. */
-    private readonly _tabList;
-    /** The TabPanels registered for this container. */
-    private readonly _tabPanels;
-    /** The TabPanels registered for this container. */
-    private readonly _tabPanelsList;
+    readonly _tabList: _angular_core.WritableSignal<TabList | undefined>;
+    /** The collection of TabPanels. */
+    readonly _collection: SortedCollection<TabPanel>;
+    /** The Tab UIPattern of the child Tabs. */
+    readonly _tabPatterns: _angular_core.Signal<TabPattern[] | undefined>;
+    /** The TabPanel UIPattern of the child TabPanels. */
+    readonly _tabPanelPatterns: _angular_core.Signal<TabPanelPattern[]>;
+    /** A reactive map of tab values to their TabPanelPattern. */
+    readonly _panelMap: _angular_core.Signal<Map<string, TabPanelPattern>>;
+    /** A reactive map of tab values to their TabPattern. */
+    readonly _tabMap: _angular_core.Signal<Map<string, TabPattern>>;
     constructor();
-    _registerList(list: TabList): void;
-    _unregisterList(list: TabList): void;
-    _registerPanel(panel: TabPanel): void;
-    _unregisterPanel(panel: TabPanel): void;
-    findTabPanel(value?: string): TabPanel | undefined;
+    ngOnDestroy(): void;
+    _register(child: TabList): void;
+    _unregister(): void;
     static ɵfac: _angular_core.ɵɵFactoryDeclaration<Tabs, never>;
     static ɵdir: _angular_core.ɵɵDirectiveDeclaration<Tabs, "[ngTabs]", ["ngTabs"], {}, {}, never, never, true, never>;
 }

package/types/toolbar-testing.d.ts

@@ -12,6 +12,8 @@ interface ToolbarWidgetHarnessFilters extends BaseHarnessFilters {
     text?: string | RegExp;
     /** Active state that the widget should match. */
     active?: boolean;
+    /** Selected state that the widget should match. */
+    selected?: boolean;
 }
 
 /** Harness for interacting with an Aria toolbar widget in tests. */
@@ -32,6 +34,8 @@ declare class ToolbarWidgetHarness extends ContentContainerComponentHarness<stri
     isActive(): Promise<boolean>;
     /** Gets whether the widget is disabled. */
     isDisabled(): Promise<boolean>;
+    /** Gets whether the widget is selected. */
+    isSelected(): Promise<boolean>;
 }
 
 /** Harness for interacting with an Aria toolbar widget group in tests. */

package/types/toolbar.d.ts

@@ -2,7 +2,7 @@ import * as _angular_core from '@angular/core';
 import { OnInit, OnDestroy } from '@angular/core';
 import * as _angular_cdk_bidi from '@angular/cdk/bidi';
 import { ToolbarWidgetGroupPattern, ToolbarWidgetPattern, ToolbarPattern } from './_toolbar-chunk.js';
-import './_signal-like-chunk.js';
+import { SortedCollection } from './_collection-chunk.js';
 import './_list-chunk.js';
 import './_list-navigation-chunk.js';
 
@@ -108,13 +108,13 @@ declare class ToolbarWidget<V> implements OnInit, OnDestroy {
  *
  * @see [Toolbar](guide/aria/toolbar)
  */
-declare class Toolbar<V> {
+declare class Toolbar<V> implements OnDestroy {
     /** A reference to the host element. */
     private readonly _elementRef;
     /** A reference to the host element. */
     readonly element: HTMLElement;
-    /** The TabList nested inside of the container. */
-    private readonly _widgets;
+    /** The collection of widgets in the toolbar. */
+    readonly _collection: SortedCollection<ToolbarWidget<V>>;
     /** Text direction. */
     readonly textDirection: _angular_core.WritableSignal<_angular_cdk_bidi.Direction>;
     /** Sorted UIPatterns of the child widgets */
@@ -135,8 +135,7 @@ declare class Toolbar<V> {
     /** The toolbar UIPattern. */
     readonly _pattern: ToolbarPattern<V>;
     constructor();
-    _register(widget: ToolbarWidget<V>): void;
-    _unregister(widget: ToolbarWidget<V>): void;
+    ngOnDestroy(): void;
     /** Finds the toolbar item associated with a given element. */
     private _getItem;
     static ɵfac: _angular_core.ɵɵFactoryDeclaration<Toolbar<any>, never>;

package/types/tree-testing.d.ts

@@ -38,6 +38,14 @@ declare class TreeItemHarness extends ContentContainerComponentHarness<string> {
     getText(): Promise<string>;
     /** Clicks the tree item. */
     click(): Promise<void>;
+    /** Focuses the tree item. */
+    focus(): Promise<void>;
+    /** Blurs the tree item. */
+    blur(): Promise<void>;
+    /** Whether the tree item is active. */
+    isActive(): Promise<boolean>;
+    /** Whether the tree item has focus. */
+    isFocused(): Promise<boolean>;
     private _getHostAttribute;
 }
 

package/types/tree.d.ts

@@ -2,17 +2,13 @@ import * as _angular_cdk_bidi from '@angular/cdk/bidi';
 import * as _angular_core from '@angular/core';
 import { OnInit, OnDestroy, Signal } from '@angular/core';
 import { TreeItemPattern, TreePattern } from './_tree-chunk.js';
+import { HasElement, SortedCollection } from './_collection-chunk.js';
 import { DeferredContent, DeferredContentAware } from './_deferred-content-chunk.js';
-import { HasElement } from './_element-chunk.js';
-import { ComboboxPopup } from './combobox.js';
-export { Combobox as ɵɵCombobox, ComboboxDialog as ɵɵComboboxDialog, ComboboxInput as ɵɵComboboxInput, ComboboxPopupContainer as ɵɵComboboxPopupContainer } from './combobox.js';
-import './_signal-like-chunk.js';
 import './_expansion-chunk.js';
 import './_list-navigation-chunk.js';
 import './_list-chunk.js';
 import './_keyboard-event-manager-chunk.js';
 import './_click-event-manager-chunk.js';
-import './_combobox-chunk.js';
 
 /**
  * Group that contains children tree items.
@@ -154,15 +150,13 @@ declare class TreeItem<V> extends DeferredContentAware implements OnInit, OnDest
  *
  * @see [Tree](guide/aria/tree)
  */
-declare class Tree<V> {
+declare class Tree<V> implements OnDestroy {
     /** A reference to the host element. */
     private readonly _elementRef;
     /** A reference to the host element. */
     readonly element: HTMLElement;
-    /** A reference to the parent combobox popup, if one exists. */
-    private readonly _popup;
-    /** All TreeItem instances within this tree. */
-    private readonly _unorderedItems;
+    /** The collection of tree items. */
+    readonly _collection: SortedCollection<TreeItem<V>>;
     /** A unique identifier for the tree. */
     readonly id: _angular_core.InputSignal<string>;
     /** Orientation of the tree. */
@@ -210,11 +204,10 @@ declare class Tree<V> {
     /** The ID of the active descendant in the tree. */
     readonly activeDescendant: Signal<string | undefined>;
     constructor();
-    _register(child: TreeItem<V>): void;
-    _unregister(child: TreeItem<V>): void;
+    ngOnDestroy(): void;
     scrollActiveItemIntoView(options?: ScrollIntoViewOptions): void;
     static ɵfac: _angular_core.ɵɵFactoryDeclaration<Tree<any>, never>;
-    static ɵdir: _angular_core.ɵɵDirectiveDeclaration<Tree<any>, "[ngTree]", ["ngTree"], { "id": { "alias": "id"; "required": false; "isSignal": true; }; "orientation": { "alias": "orientation"; "required": false; "isSignal": true; }; "multi": { "alias": "multi"; "required": false; "isSignal": true; }; "disabled": { "alias": "disabled"; "required": false; "isSignal": true; }; "selectionMode": { "alias": "selectionMode"; "required": false; "isSignal": true; }; "focusMode": { "alias": "focusMode"; "required": false; "isSignal": true; }; "wrap": { "alias": "wrap"; "required": false; "isSignal": true; }; "softDisabled": { "alias": "softDisabled"; "required": false; "isSignal": true; }; "typeaheadDelay": { "alias": "typeaheadDelay"; "required": false; "isSignal": true; }; "tabIndex": { "alias": "tabIndex"; "required": false; "isSignal": true; }; "value": { "alias": "value"; "required": false; "isSignal": true; }; "nav": { "alias": "nav"; "required": false; "isSignal": true; }; "currentType": { "alias": "currentType"; "required": false; "isSignal": true; }; }, { "value": "valueChange"; }, never, never, true, [{ directive: typeof ComboboxPopup; inputs: {}; outputs: {}; }]>;
+    static ɵdir: _angular_core.ɵɵDirectiveDeclaration<Tree<any>, "[ngTree]", ["ngTree"], { "id": { "alias": "id"; "required": false; "isSignal": true; }; "orientation": { "alias": "orientation"; "required": false; "isSignal": true; }; "multi": { "alias": "multi"; "required": false; "isSignal": true; }; "disabled": { "alias": "disabled"; "required": false; "isSignal": true; }; "selectionMode": { "alias": "selectionMode"; "required": false; "isSignal": true; }; "focusMode": { "alias": "focusMode"; "required": false; "isSignal": true; }; "wrap": { "alias": "wrap"; "required": false; "isSignal": true; }; "softDisabled": { "alias": "softDisabled"; "required": false; "isSignal": true; }; "typeaheadDelay": { "alias": "typeaheadDelay"; "required": false; "isSignal": true; }; "tabIndex": { "alias": "tabindex"; "required": false; "isSignal": true; }; "value": { "alias": "value"; "required": false; "isSignal": true; }; "nav": { "alias": "nav"; "required": false; "isSignal": true; }; "currentType": { "alias": "currentType"; "required": false; "isSignal": true; }; }, { "value": "valueChange"; }, never, never, true, never>;
 }
 
-export { Tree, TreeItem, TreeItemGroup, ComboboxPopup as ɵɵComboboxPopup, DeferredContent as ɵɵDeferredContent };
+export { Tree, TreeItem, TreeItemGroup, DeferredContent as ɵɵDeferredContent };