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

Refocus when clicking on add split button #28423

Merged
merged 4 commits into from
Oct 2, 2023
Merged

Refocus when clicking on add split button #28423

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
229eaef
refocus when clicking on add split button
dukenv0307 Sep 29, 2023
9b5d5df
Merge branch 'main' into fix/28070
dukenv0307 Oct 2, 2023
b8b294d
add js doc
dukenv0307 Oct 2, 2023
ca42b72
Merge branch 'main' into fix/28070
dukenv0307 Oct 2, 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
17 changes: 16 additions & 1 deletion src/components/OptionsSelector/BaseOptionsSelector.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ class BaseOptionsSelector extends Component {
this.scrollToIndex = this.scrollToIndex.bind(this);
this.selectRow = this.selectRow.bind(this);
this.selectFocusedOption = this.selectFocusedOption.bind(this);
this.addToSelection = this.addToSelection.bind(this);
this.relatedTarget = null;

const allOptions = this.flattenSections();
Expand Down Expand Up @@ -337,6 +338,20 @@ class BaseOptionsSelector extends Component {
});
}

/**
* Completes the follow-up action after clicking on multiple select button
* @param {Object} option
*/
addToSelection(option) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

JSDoc, please.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@tgolen I just updated.

if (this.props.shouldShowTextInput && this.props.shouldFocusOnSelectRow) {
this.textInput.focus();
if (this.textInput.isFocused()) {
setSelection(this.textInput, 0, this.props.value.length);
}
}
this.props.onAddToSelection(option);
}

render() {
const shouldShowFooter =
!this.props.isReadOnly && (this.props.shouldShowConfirmButton || this.props.footerContent) && !(this.props.canSelectMultipleOptions && _.isEmpty(this.props.selectedOptions));
Expand Down Expand Up @@ -377,7 +392,7 @@ class BaseOptionsSelector extends Component {
canSelectMultipleOptions={this.props.canSelectMultipleOptions}
shouldShowMultipleOptionSelectorAsButton={this.props.shouldShowMultipleOptionSelectorAsButton}
multipleOptionSelectorButtonText={this.props.multipleOptionSelectorButtonText}
onAddToSelection={this.props.onAddToSelection}
onAddToSelection={this.addToSelection}
hideSectionHeaders={this.props.hideSectionHeaders}
headerMessage={this.props.headerMessage}
boldStyle={this.props.boldStyle}
Expand Down
Loading