Skip to content

Commit fb7d2a7

Browse files
committed
refactor: redo combobox and remove view encapsulation
1 parent 733dae9 commit fb7d2a7

File tree

4 files changed

+5
-14
lines changed

4 files changed

+5
-14
lines changed

src/dev-app/aria-docs-examples/aria-docs-examples.html

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -58,25 +58,20 @@ <h2>
5858

5959
<h1>Combobox</h1>
6060

61-
<div ngCombobox>
61+
<div ngCombobox #combobox="ngCombobox">
6262
<input ngComboboxInput #comboboxInput="ngComboboxInput"
63-
(click)="open.set(true)"
64-
cdkOverlayOrigin #overlayOrigin="cdkOverlayOrigin"/>
63+
#inputElement/>
6564

6665
<ng-template
67-
cdkConnectedOverlay
68-
[cdkConnectedOverlayAsPopover]="true"
69-
[cdkConnectedOverlayOrigin]="overlayOrigin"
70-
[cdkConnectedOverlayOpen]="open()">
71-
<ng-template ngComboboxPopupContainer>
66+
[cdkConnectedOverlay]="{origin: inputElement, usePopover: true, matchWidth: true}"
67+
[cdkConnectedOverlayOpen]="combobox.expanded()">
7268
<div ngListbox>
7369
<div ngOption value="apple">
7470
Apple
7571
</div>
7672
<div ngOption value="banana"> Banana </div>
7773
<div ngOption value="orange"> Orange </div>
7874
</div>
79-
</ng-template>
8075
</ng-template>
8176
</div>
8277

src/dev-app/aria-docs-examples/aria-docs-examples.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ import {Tree, TreeItem, TreeItemGroup} from '@angular/aria/tree';
3232
AccordionContent,
3333
Combobox,
3434
ComboboxInput,
35-
ComboboxPopupContainer,
3635
Listbox,
3736
Option,
3837
Grid,

src/dev-app/aria-docs-examples/autocomplete/autocomplete-docs-demo.html

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
<ng-template
99
[cdkConnectedOverlay]="{origin: inputElement, usePopover: true, matchWidth: true}"
1010
[cdkConnectedOverlayOpen]="combobox.expanded()">
11-
<ng-template ngComboboxPopupContainer>
1211
<div [(value)]="currentSelection" ngListbox>
1312
@for (biomeOption of biomeOptions(); track biomeOption) {
1413
<div ngOption [value]="biomeOption.id" [label]="biomeOption.name">
@@ -18,6 +17,5 @@
1817
No matching biomes.
1918
}
2019
</div>
21-
</ng-template>
2220
</ng-template>
2321
</div>

src/dev-app/aria-docs-examples/autocomplete/autocomplete-docs-demo.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,7 @@ const biomes = [
2929
@Component({
3030
templateUrl: 'autocomplete-docs-demo.html',
3131
styleUrl: 'autocomplete-docs-demo.css',
32-
imports: [Combobox, ComboboxInput, ComboboxPopupContainer, Listbox, Option, OverlayModule],
33-
encapsulation: ViewEncapsulation.None,
32+
imports: [Combobox, ComboboxInput, Listbox, Option, OverlayModule],
3433
changeDetection: ChangeDetectionStrategy.OnPush,
3534
})
3635
export class AutocompleteDocsDemo {

0 commit comments

Comments
 (0)