Skip to content

Commit fdfe3a1

Browse files
authored
Merge branch 'angular:main' into slide-toggle-tt
2 parents 6ae6659 + 6716f50 commit fdfe3a1

File tree

18 files changed

+87
-80
lines changed

18 files changed

+87
-80
lines changed

src/components-examples/cdk-experimental/listbox/cdk-listbox-active-descendant/cdk-listbox-active-descendant-example.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
<ul
44
cdkListbox
55
focusMode="activedescendant"
6-
class="example-listbox"
6+
class="example-listbox example-parent"
77
aria-labelledby="active-descendant-label"
88
>
99
<label class="example-label" id="active-descendant-label">Active Descendant Fruits</label>
1010
@for (fruit of fruits; track fruit) {
1111
<li
12-
class="example-option"
12+
class="example-option example-stateful example-selectable"
1313
[value]="fruit"
1414
cdkOption
1515
#option="cdkOption"

src/components-examples/cdk-experimental/listbox/cdk-listbox-configurable/cdk-listbox-configurable-example.css

Lines changed: 0 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,6 @@
3131
display: block;
3232
}
3333

34-
.example-listbox[aria-disabled='true'] {
35-
opacity: 0.5;
36-
}
37-
3834
.example-listbox[aria-disabled='true'] .example-option {
3935
pointer-events: none;
4036
}
@@ -53,39 +49,3 @@
5349
align-items: center;
5450
border-radius: var(--mat-sys-corner-extra-small);
5551
}
56-
57-
.example-option.cdk-active,
58-
.example-option[aria-disabled='false']:hover {
59-
outline: 1px solid var(--mat-sys-outline);
60-
background: var(--mat-sys-surface-container);
61-
}
62-
63-
.example-option[aria-disabled='false']:focus-within {
64-
outline: 2px solid var(--mat-sys-primary);
65-
background: var(--mat-sys-surface-container);
66-
}
67-
68-
.example-option[aria-disabled='false'][aria-selected='true'] {
69-
background-color: var(--mat-sys-secondary-container);
70-
}
71-
72-
.example-option.cdk-active[aria-disabled='true'],
73-
.example-option[aria-disabled='true']:focus-within {
74-
outline: 2px solid var(--mat-sys-outline);
75-
}
76-
77-
.example-option[aria-disabled='true'] span {
78-
opacity: 0.3;
79-
}
80-
81-
.example-option[aria-disabled='true']::before {
82-
content: '';
83-
position: absolute;
84-
width: 100%;
85-
height: 100%;
86-
top: 0;
87-
left: 0;
88-
border-radius: var(--mat-sys-corner-extra-small);
89-
background-color: var(--mat-sys-on-surface);
90-
opacity: var(--mat-sys-focus-state-layer-opacity);
91-
}

src/components-examples/cdk-experimental/listbox/cdk-listbox-configurable/cdk-listbox-configurable-example.html

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@
5151
<!-- #docregion listbox -->
5252
<ul
5353
cdkListbox
54+
#listbox="cdkListbox"
5455
[value]="selection"
5556
[wrap]="wrap.value"
5657
[multi]="multi.value"
@@ -60,22 +61,22 @@
6061
[orientation]="orientation"
6162
[focusMode]="focusMode"
6263
[selectionMode]="selectionMode"
63-
class="example-listbox"
64+
class="example-listbox example-parent"
6465
>
6566
<label class="example-label" id="fruit-example-label">List of Fruits</label>
6667

6768
@for (fruit of fruits; track fruit) {
6869
@let optionDisabled = disabledOptions.includes(fruit);
6970

7071
<li
71-
class="example-option"
72+
class="example-option example-stateful example-selectable"
7273
[disabled]="optionDisabled"
7374
[value]="fruit"
7475
cdkOption
7576
#option="cdkOption"
7677
>
7778
<mat-pseudo-checkbox
78-
[disabled]="optionDisabled"
79+
[disabled]="optionDisabled || listbox.disabled()"
7980
[state]="option.pattern.selected() ? 'checked' : 'unchecked'"
8081
></mat-pseudo-checkbox>
8182
<span>{{ fruit }}</span>

src/components-examples/cdk-experimental/listbox/cdk-listbox-disabled-focusable/cdk-listbox-disabled-focusable-example.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
<ul
44
cdkListbox
55
[skipDisabled]="false"
6-
class="example-listbox"
6+
class="example-listbox example-parent"
77
aria-labelledby="disabled-focusable-label"
88
>
99
<label class="example-label" id="disabled-focusable-label">Disabled Focusable Fruits</label>
1010
@for (fruit of fruits; track fruit; let i = $index) {
1111
<li
12-
class="example-option"
12+
class="example-option example-stateful example-selectable"
1313
[value]="fruit"
1414
[disabled]="i % 2 === 0"
1515
cdkOption

src/components-examples/cdk-experimental/listbox/cdk-listbox-disabled-skipped/cdk-listbox-disabled-skipped-example.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
<ul
44
cdkListbox
55
[skipDisabled]="true"
6-
class="example-listbox"
6+
class="example-listbox example-parent"
77
aria-labelledby="disabled-skipped-label"
88
>
99
<label class="example-label" id="disabled-skipped-label">Disabled Skipped Fruits</label>
1010
@for (fruit of fruits; track fruit; let i = $index) {
1111
<li
12-
class="example-option"
12+
class="example-option example-stateful example-selectable"
1313
[value]="fruit"
1414
[disabled]="i % 2 === 0"
1515
cdkOption

src/components-examples/cdk-experimental/listbox/cdk-listbox-disabled/cdk-listbox-disabled-example.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22
<ul
33
cdkListbox
44
[disabled]="true"
5-
class="example-listbox"
5+
class="example-listbox example-parent"
66
aria-labelledby="disabled-label"
77
>
88
<label class="example-label" id="disabled-label">Disabled Fruits</label>
99
@for (fruit of fruits; track fruit) {
1010
<li
11-
class="example-option"
11+
class="example-option example-stateful example-selectable"
1212
[value]="fruit"
1313
cdkOption
1414
#option="cdkOption"

src/components-examples/cdk-experimental/listbox/cdk-listbox-horizontal/cdk-listbox-horizontal-example.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
<ul
44
cdkListbox
55
orientation="horizontal"
6-
class="example-listbox"
6+
class="example-listbox example-parent"
77
aria-labelledby="horizontal-label"
88
>
99
<label class="example-label" id="horizontal-label">Horizontal Fruits</label>
1010
@for (fruit of fruits; track fruit) {
1111
<li
12-
class="example-option"
12+
class="example-option example-stateful example-selectable"
1313
[value]="fruit"
1414
cdkOption
1515
#option="cdkOption"

src/components-examples/cdk-experimental/listbox/cdk-listbox-multi-select-follow-focus/cdk-listbox-multi-select-follow-focus-example.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44
cdkListbox
55
[multi]="true"
66
selectionMode="follow"
7-
class="example-listbox"
7+
class="example-listbox example-parent"
88
aria-labelledby="multi-follow-label"
99
>
1010
<label class="example-label" id="multi-follow-label">Multi Select (Follow Focus) Fruits</label>
1111
@for (fruit of fruits; track fruit) {
1212
<li
13-
class="example-option"
13+
class="example-option example-stateful example-selectable"
1414
[value]="fruit"
1515
cdkOption
1616
#option="cdkOption"

src/components-examples/cdk-experimental/listbox/cdk-listbox-multi-select/cdk-listbox-multi-select-example.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44
cdkListbox
55
[multi]="true"
66
selectionMode="explicit"
7-
class="example-listbox"
7+
class="example-listbox example-parent"
88
aria-labelledby="multi-select-label"
99
>
1010
<label class="example-label" id="multi-select-label">Multi Select Fruits</label>
1111
@for (fruit of fruits; track fruit) {
1212
<li
13-
class="example-option"
13+
class="example-option example-stateful example-selectable"
1414
[value]="fruit"
1515
cdkOption
1616
#option="cdkOption"

src/components-examples/cdk-experimental/listbox/cdk-listbox-readonly/cdk-listbox-readonly-example.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
<ul
44
cdkListbox
55
[readonly]="true"
6-
class="example-listbox"
6+
class="example-listbox example-parent"
77
aria-labelledby="readonly-label"
88
>
99
<label class="example-label" id="readonly-label">Readonly Fruits</label>
1010
@for (fruit of fruits; track fruit) {
1111
<li
12-
class="example-option"
12+
class="example-option example-stateful example-selectable"
1313
[value]="fruit"
1414
cdkOption
1515
#option="cdkOption"

0 commit comments

Comments
 (0)