From a74bbb424c7c07494d71329e8d4c6ef9fc37a7b9 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Sat, 15 Apr 2017 11:37:09 +0100
Subject: [PATCH] cmd-k shortcut to the searchbox
---
src/components/structures/SearchBox.js | 30 ++++++++++++++++++++++++++
1 file changed, 30 insertions(+)
diff --git a/src/components/structures/SearchBox.js b/src/components/structures/SearchBox.js
index 729e7ef7..fb5beab1 100644
--- a/src/components/structures/SearchBox.js
+++ b/src/components/structures/SearchBox.js
@@ -21,6 +21,7 @@ var sdk = require('matrix-react-sdk')
var dis = require('matrix-react-sdk/lib/dispatcher');
var rate_limited_func = require('matrix-react-sdk/lib/ratelimitedfunc');
var AccessibleButton = require('matrix-react-sdk/lib/components/views/elements/AccessibleButton');
+var KeyCode = require('matrix-react-sdk/lib/KeyCode');
module.exports = React.createClass({
displayName: 'SearchBox',
@@ -38,10 +39,12 @@ module.exports = React.createClass({
componentDidMount: function() {
this.dispatcherRef = dis.register(this.onAction);
+ document.addEventListener('keydown', this._onKeyDown);
},
componentWillUnmount: function() {
dis.unregister(this.dispatcherRef);
+ document.removeEventListener('keydown', this._onKeyDown);
},
onAction: function(payload) {
@@ -90,6 +93,33 @@ module.exports = React.createClass({
this.onChange();
},
+ _onKeyDown: function(ev) {
+ let handled = false;
+ const isMac = navigator.platform.toUpperCase().indexOf('MAC') >= 0;
+ let ctrlCmdOnly;
+ if (isMac) {
+ ctrlCmdOnly = ev.metaKey && !ev.altKey && !ev.ctrlKey && !ev.shiftKey;
+ } else {
+ ctrlCmdOnly = ev.ctrlKey && !ev.altKey && !ev.metaKey && !ev.shiftKey;
+ }
+
+ switch (ev.keyCode) {
+ case KeyCode.KEY_K:
+ if (ctrlCmdOnly) {
+ if (this.refs.search) {
+ this.refs.search.focus();
+ }
+ handled = true;
+ }
+ break;
+ }
+
+ if (handled) {
+ ev.stopPropagation();
+ ev.preventDefault();
+ }
+ },
+
render: function() {
var TintableSvg = sdk.getComponent('elements.TintableSvg');