Skip to content

fix(cdk/listbox): avoid resetting scroll position when using mouse #30903

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

fix(cdk/listbox): avoid resetting scroll position when using mouse #30903

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0c6494e
fix(material/select): select shrinking after scroll
SergheiGurgurov Apr 18, 2025
13f3394
fix(cdk/listbox): avoid resetting scroll position when using mouse
SergheiGurgurov Apr 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 23 additions & 9 deletions src/cdk/listbox/listbox.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
import {
_IdGenerator,
ActiveDescendantKeyManager,
FocusMonitor,
Highlightable,
ListKeyManagerOption,
} from '../a11y';
Expand Down Expand Up @@ -243,7 +244,6 @@ export class CdkOption<T = unknown> implements ListKeyManagerOption, Highlightab
'[attr.aria-multiselectable]': 'multiple',
'[attr.aria-activedescendant]': '_getAriaActiveDescendant()',
'[attr.aria-orientation]': 'orientation',
'(focus)': '_handleFocus()',
'(keydown)': '_handleKeydown($event)',
'(focusout)': '_handleFocusOut($event)',
'(focusin)': '_handleFocusIn()',
Expand All @@ -269,6 +269,7 @@ export class CdkListbox<T = unknown> implements AfterContentInit, OnDestroy, Con
}
private _id: string;
private _generatedId = inject(_IdGenerator).getId('cdk-listbox-');
private _focusMonitor = inject(FocusMonitor);

/** The tabindex to use when the listbox is enabled. */
@Input('tabindex')
Expand Down Expand Up @@ -462,6 +463,7 @@ export class CdkListbox<T = unknown> implements AfterContentInit, OnDestroy, Con
}

this._initKeyManager();
this._handleFocus();

// Update the internal value whenever the options or the model value changes.
merge(this.selectionModel.changed, this.options.changes)
Expand All @@ -477,6 +479,7 @@ export class CdkListbox<T = unknown> implements AfterContentInit, OnDestroy, Con
}

ngOnDestroy() {
this._focusMonitor.stopMonitoring(this.element);
this._cleanupWindowBlur?.();
this.listKeyManager?.destroy();
this.destroyed.next();
Expand Down Expand Up @@ -698,15 +701,26 @@ export class CdkListbox<T = unknown> implements AfterContentInit, OnDestroy, Con

/** Called when the listbox receives focus. */
protected _handleFocus() {
if (!this.useActiveDescendant) {
if (this.selectionModel.selected.length > 0) {
this._setNextFocusToSelectedOption();
} else {
this.listKeyManager.setNextItemActive();
}
this._focusMonitor
.monitor(this.element, false)
.pipe(takeUntil(this.destroyed))
.subscribe(focusOrigin => {
// Don't forward focus on mouse interactions, because it can
// mess with the user's scroll position. See #30900.
if (focusOrigin === 'mouse' || focusOrigin === null) {
return;
}

this._focusActiveOption();
}
if (!this.useActiveDescendant) {
if (this.selectionModel.selected.length > 0) {
this._setNextFocusToSelectedOption();
} else {
this.listKeyManager.setNextItemActive();
}

this._focusActiveOption();
}
});
}

/** Called when the user presses keydown on the listbox. */
Expand Down
1 change: 1 addition & 0 deletions src/material/select/select.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
[cdkConnectedOverlayPositions]="_positions"
[cdkConnectedOverlayWidth]="_overlayWidth"
[cdkConnectedOverlayFlexibleDimensions]="true"
[cdkConnectedOverlayGrowAfterOpen]="true"
(detach)="close()"
(backdropClick)="close()"
(overlayKeydown)="_handleOverlayKeydown($event)">
Expand Down
Loading