Skip to content

Commit 59860c5

Browse files
committed
fix(cdk-experimental/toolbar): focus mode removal
1 parent 0b8e7ec commit 59860c5

File tree

4 files changed

+2
-14
lines changed

4 files changed

+2
-14
lines changed

src/cdk-experimental/radio-group/radio-group.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -163,6 +163,7 @@ export class CdkRadioGroup<V> {
163163
}
164164
});
165165

166+
// TODO: Refactor to be handled within list behavior
166167
afterRenderEffect(() => {
167168
if (this.toolbar) {
168169
const radioButtons = this._cdkRadioButtons();

src/cdk-experimental/toolbar/toolbar.ts

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -97,9 +97,6 @@ export class CdkToolbar<V> {
9797
/** Whether disabled items in the group should be skipped when navigating. */
9898
skipDisabled = input(true, {transform: booleanAttribute});
9999

100-
/** The focus strategy used by the toolbar. */
101-
focusMode = input<'roving' | 'activedescendant'>('roving');
102-
103100
/** Whether the toolbar is disabled. */
104101
disabled = input(false, {transform: booleanAttribute});
105102

@@ -111,7 +108,7 @@ export class CdkToolbar<V> {
111108
...this,
112109
activeItem: signal(undefined),
113110
textDirection: this.textDirection,
114-
focusMode: this.focusMode,
111+
focusMode: signal('roving'),
115112
});
116113

117114
/** Whether the toolbar has received focus yet. */

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

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,6 @@ <h4 class="example-heading">Toolbar Controls</h4>
1111
<mat-option value="horizontal">Horizontal</mat-option>
1212
</mat-select>
1313
</mat-form-field>
14-
15-
<mat-form-field subscriptSizing="dynamic" appearance="outline">
16-
<mat-label>Focus strategy</mat-label>
17-
<mat-select [(value)]="focusMode">
18-
<mat-option value="roving">Roving Tabindex</mat-option>
19-
<mat-option value="activedescendant">Active Descendant</mat-option>
20-
</mat-select>
21-
</mat-form-field>
2214
</div>
2315
<h4 class="example-heading">Radio Group Controls</h4>
2416
<div class="example-toolbar-controls">
@@ -50,7 +42,6 @@ <h4 class="example-heading">Button</h4>
5042
<div
5143
cdkToolbar
5244
[orientation]="orientation"
53-
[focusMode]="focusMode"
5445
[skipDisabled]="skipDisabled.value"
5546
[wrap]="wrap.value"
5647
[disabled]="toolbarDisabled.value"

src/components-examples/cdk-experimental/toolbar/cdk-toolbar-configurable/cdk-toolbar-configurable-example.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ export class CdkToolbarConfigurableExample {
3030
wrap = new FormControl(true, {nonNullable: true});
3131
toolbarDisabled = new FormControl(false, {nonNullable: true});
3232
orientation: 'vertical' | 'horizontal' = 'horizontal';
33-
focusMode: 'roving' | 'activedescendant' = 'roving';
3433

3534
fruits = ['Apple', 'Apricot', 'Banana'];
3635
buttonFruits = ['Pear', 'Blueberry', 'Cherry', 'Date'];

0 commit comments

Comments
 (0)