Skip to content

Commit f8db67a

Browse files
committed
fix up computed changes
1 parent 51feaed commit f8db67a

File tree

2 files changed

+4
-10
lines changed

2 files changed

+4
-10
lines changed

src/aria/listbox/listbox.ts

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,7 @@ import {
1919
signal,
2020
untracked,
2121
} from '@angular/core';
22-
import {
23-
ComboboxListboxPattern,
24-
ListboxPattern,
25-
OptionPattern,
26-
SignalLike,
27-
} from '@angular/aria/private';
22+
import {ComboboxListboxPattern, ListboxPattern, OptionPattern} from '@angular/aria/private';
2823
import {Directionality} from '@angular/cdk/bidi';
2924
import {toSignal} from '@angular/core/rxjs-interop';
3025
import {_IdGenerator} from '@angular/cdk/a11y';
@@ -68,7 +63,7 @@ export class Listbox<V> {
6863
private readonly _generatedId = inject(_IdGenerator).getId('ng-listbox-', true);
6964

7065
/** A unique identifier for the listbox. */
71-
protected id: SignalLike<string> = () => this._generatedId;
66+
protected id = () => this._generatedId;
7267

7368
/** A reference to the parent combobox popup, if one exists. */
7469
private readonly _popup = inject<ComboboxPopup<V>>(ComboboxPopup, {
@@ -223,7 +218,7 @@ export class Option<V> {
223218
private readonly _generatedId = inject(_IdGenerator).getId('ng-option-', true);
224219

225220
/** A unique identifier for the option. */
226-
protected id: SignalLike<string> = () => this._generatedId;
221+
protected id = () => this._generatedId;
227222

228223
// TODO(wagnermaciel): See if we want to change how we handle this since textContent is not
229224
// reactive. See https://github.com/angular/components/pull/30495#discussion_r1961260216.

src/aria/tree/tree.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ import {
3030
TreePattern,
3131
DeferredContent,
3232
DeferredContentAware,
33-
SignalLike,
3433
} from '@angular/aria/private';
3534
import {ComboboxPopup} from '../combobox';
3635

@@ -91,7 +90,7 @@ export class Tree<V> {
9190
private readonly _generatedId = inject(_IdGenerator).getId('ng-tree-', true);
9291

9392
/** A unique identifier for the tree. */
94-
protected id: SignalLike<string> = () => this._generatedId;
93+
protected id = () => this._generatedId;
9594

9695
/** A reference to the parent combobox popup, if one exists. */
9796
private readonly _popup = inject<ComboboxPopup<V>>(ComboboxPopup, {

0 commit comments

Comments
 (0)