Shortcuts: respect data-enabled-shortcuts if it's specified [publish]

JetBrains · Apr 20, 2021 · 473d554 · 473d554
1 parent 49474f7
commit 473d554
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git 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
@@ -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;
     }