diff --git a/components/select/select.js b/components/select/select.js index d22b8a9f945..708ef69d516 100644 --- a/components/select/select.js +++ b/components/select/select.js @@ -1128,6 +1128,12 @@ export default class Select extends Component { placeholder={this.props.inputPlaceholder} onKeyDown={this.props.onKeyDown} data-test="ring-select__focus" + enableShortcuts={shortcutsEnabled + ? Object.keys({ + ...this.getShortcutsMap(), + ...this._popup?.list?.shortcutsMap + }) + : undefined} /> {this.props.type === Type.INPUT && iconsNode} {this._renderPopup()} diff --git a/components/shortcuts/core.js b/components/shortcuts/core.js index 76821afafcc..c49b5ee0d0b 100644 --- a/components/shortcuts/core.js +++ b/components/shortcuts/core.js @@ -190,9 +190,9 @@ class Shortcuts { if ( element === document || element.matches(this.ALLOW_SHORTCUTS_SELECTOR) || - element.closest(this.ALLOW_SHORTCUTS_SELECTOR) || - element.dataset.enabledShortcuts != null && - element.dataset.enabledShortcuts.split(',').includes(key) + (element.dataset.enabledShortcuts != null + ? element.dataset.enabledShortcuts.split(',').includes(key) + : element.closest(this.ALLOW_SHORTCUTS_SELECTOR) != null) ) { return false; }