Skip to content
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

Fix auto scroll when the display name is changed #27632

Merged
merged 4 commits into from
Oct 5, 2023
Merged

Fix auto scroll when the display name is changed #27632

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
dc9c90f
fix auto scroll when the display name is changed
dukenv0307 Sep 18, 2023
44e8751
fix lint
dukenv0307 Sep 18, 2023
0f36b17
merge main
dukenv0307 Sep 24, 2023
7a87f16
Merge branch 'main' into fix/25947
dukenv0307 Sep 25, 2023
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
7 changes: 4 additions & 3 deletions src/components/OptionsSelector/BaseOptionsSelector.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,8 +107,9 @@ class BaseOptionsSelector extends Component {
});
return;
}

const newFocusedIndex = this.props.selectedOptions.length;
const isNewFocusedIndex = newFocusedIndex !== this.state.focusedIndex;

// eslint-disable-next-line react/no-did-update-set-state
this.setState(
{
Expand All @@ -117,13 +118,13 @@ class BaseOptionsSelector extends Component {
},
() => {
// If we just toggled an option on a multi-selection page or cleared the search input, scroll to top
if (this.props.selectedOptions.length !== prevProps.selectedOptions.length || this.props.value === '') {
if (this.props.selectedOptions.length !== prevProps.selectedOptions.length || (!!prevProps.value && !this.props.value)) {
this.scrollToIndex(0);
return;
}

// Otherwise, scroll to the focused index (as long as it's in range)
if (this.state.allOptions.length <= this.state.focusedIndex) {
if (this.state.allOptions.length <= this.state.focusedIndex || !isNewFocusedIndex) {
return;
}
this.scrollToIndex(this.state.focusedIndex);
Expand Down