Focus on enter

2020-04-27 19:03:07 +03:00 · 2020-04-27 19:03:07 +03:00 · d436eaed80
parent 1c7709bdd4
commit d436eaed80
1 changed files with 9 additions and 3 deletions
--- a/PickerMenu.js
+++ b/PickerMenu.js
@ -44,11 +44,17 @@ export default class PickerMenu extends Picker
                this.focus();
            }
        }
-        else if ((ev.which == 10 || ev.which == 13) && this.state.active != null &&
-            this.state.active < this.props.items.length)
+        else if (ev.which == 10 || ev.which == 13)
        {
            // enter
-            this.onMouseDown();
+            if (!this.state.focused)
+            {
+                this.focus();
+            }
+            else if (this.state.active != null && this.state.active < this.props.items.length)
+            {
+                this.onMouseDown();
+            }
        }
    }