From 64fd6b84bfc342840770c6864274560669b37470 Mon Sep 17 00:00:00 2001
From: mama <mael.thomas@data.gouv.fr>
Date: Thu, 18 Jan 2018 19:15:29 +0100
Subject: [PATCH] =?UTF-8?q?Raccourci=20clavier=20'Entrer'=20pour=20valider?=
 =?UTF-8?q?=20les=20questions=20=C3=A0=20choix=20aussi?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 source/components/conversation/Input.js      |  3 ---
 source/components/conversation/SendButton.js | 13 +++++++++++++
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/source/components/conversation/Input.js b/source/components/conversation/Input.js
index 6e6a77b94..50821e296 100644
--- a/source/components/conversation/Input.js
+++ b/source/components/conversation/Input.js
@@ -40,9 +40,6 @@ export default class Input extends Component {
 								? { border: '2px dashed #ddd' }
 								: { border: `1px solid ${themeColours.textColourOnWhite}` }
 						}
-						onKeyDown={({ key }) =>
-							key == 'Enter' && (submitDisabled ? input.onBlur() : submit())
-						}
 					/>
 					{suffixed && (
 						<label
diff --git a/source/components/conversation/SendButton.js b/source/components/conversation/SendButton.js
index f198e074d..90e1ee262 100644
--- a/source/components/conversation/SendButton.js
+++ b/source/components/conversation/SendButton.js
@@ -7,6 +7,19 @@ export default class SendButton extends Component {
 		let { disabled, submit } = this.props
 		return () => (!disabled ? submit() : null)
 	}
+	componentDidMount() {
+		// removeEventListener will need the exact same function instance
+		this.boundHandleKeyDown = this.handleKeyDown.bind(this)
+
+		window.addEventListener('keydown', this.boundHandleKeyDown)
+	}
+	componentWillUnmount() {
+		window.removeEventListener('keydown', this.boundHandleKeyDown)
+	}
+	handleKeyDown({ key }) {
+		if (key !== 'Enter') return
+		this.getAction()()
+	}
 	render() {
 		let { disabled, themeColours, hover } = this.props
 		return (