From 70d09e6345a2071f0f4eb53ea735cb0b70766195 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lo=C3=AFc=20Guillois?= <contact@loicguillois.fr>
Date: Tue, 18 Feb 2020 14:21:24 +0100
Subject: [PATCH] =?UTF-8?q?=F0=9F=8E=A8=20Recherche=20dans=20les=20r=C3=A8?=
 =?UTF-8?q?gles:=20navigation=20clavier?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 source/components/SearchBar.css |  8 ++++++
 source/components/SearchBar.tsx | 44 ++++++++++++++++++++++++---------
 2 files changed, 41 insertions(+), 11 deletions(-)
 create mode 100644 source/components/SearchBar.css

diff --git a/source/components/SearchBar.css b/source/components/SearchBar.css
new file mode 100644
index 000000000..0dc42725b
--- /dev/null
+++ b/source/components/SearchBar.css
@@ -0,0 +1,8 @@
+li.active {
+	background: var(--color);
+	color: var(--textColor);
+}
+
+li.active a {
+	color: var(--textColor);
+}
diff --git a/source/components/SearchBar.tsx b/source/components/SearchBar.tsx
index fac84ea9e..c2fb1c251 100644
--- a/source/components/SearchBar.tsx
+++ b/source/components/SearchBar.tsx
@@ -8,6 +8,7 @@ import { Link, Redirect, useHistory } from 'react-router-dom'
 import { Rule } from 'Types/rule'
 import Worker from 'worker-loader!./SearchBar.worker.js'
 import { capitalise0 } from '../utils'
+import './SearchBar.css'
 
 const worker = new Worker()
 
@@ -29,19 +30,35 @@ export default function SearchBar({
 	const [input, setInput] = useState('')
 	const [selectedOption, setSelectedOption] = useState<Option | null>(null)
 	const [results, setResults] = useState<Array<Result>>([])
+	let [focusElem, setFocusElem] = useState(-1)
 	const { i18n } = useTranslation()
 	const history = useHistory()
 
-	useEffect(() => {
-		const handleKeyDown = (e: KeyboardEvent) => {
-			if (e.key === 'Enter' && results.length > 0) {
-				finallyCallback && finallyCallback()
-				history.push(sitePaths.documentation.rule(results[0].dottedName))
-			}
-			return true
+	const handleKeyDown = e => {
+		if (e.key === 'Enter' && results.length > 0) {
+			finallyCallback && finallyCallback()
+			history.push(
+				sitePaths.documentation.rule(
+					results[focusElem > 0 ? focusElem : 0].dottedName
+				)
+			)
 		}
-		window.addEventListener('keydown', handleKeyDown)
 
+		if (
+			e.key === 'ArrowDown' &&
+			focusElem < (results.length > 5 ? 4 : results.length - 1)
+		) {
+			if (focusElem === -1) {
+				setFocusElem(0)
+			}
+			setFocusElem(focusElem + 1)
+		} else if (e.key === 'ArrowUp' && focusElem > 0) {
+			setFocusElem(focusElem - 1)
+		}
+		return true
+	}
+
+	useEffect(() => {
 		worker.postMessage({
 			rules: rules.map(
 				pick(['title', 'espace', 'description', 'name', 'dottedName'])
@@ -49,15 +66,17 @@ export default function SearchBar({
 		})
 
 		worker.onmessage = ({ data: results }) => setResults(results)
-	}, [rules, results])
+	}, [rules, results, focusElem])
+
+	let onMouseOverHandler = () => setFocusElem(-1)
 
 	let renderOptions = (rules?: Array<Rule>) => {
 		let options =
 			(rules && sortBy(rule => rule.dottedName, rules)) || take(5)(results)
-		return <ul>{options.map(option => renderOption(option))}</ul>
+		return <ul>{options.map((option, idx) => renderOption(option, idx))}</ul>
 	}
 
-	let renderOption = (option: Option) => {
+	let renderOption = (option: Option, idx: number) => {
 		let { title, dottedName, name } = option
 		let espace = parentName(dottedName)
 			? parentName(dottedName)
@@ -68,6 +87,7 @@ export default function SearchBar({
 		return (
 			<li
 				key={dottedName}
+				className={focusElem === idx ? 'active' : `${focusElem}-inactive`}
 				css={`
 					padding: 0.4rem;
 					border-radius: 0.3rem;
@@ -80,6 +100,7 @@ export default function SearchBar({
 					}
 				`}
 				onClick={() => setSelectedOption(option)}
+				onMouseOver={() => onMouseOverHandler()}
 			>
 				<div
 					style={{
@@ -175,6 +196,7 @@ export default function SearchBar({
 				type="text"
 				value={input}
 				placeholder={i18n.t('Entrez des mots clefs ici')}
+				onKeyDown={e => handleKeyDown(e)}
 				onChange={e => {
 					let input = e.target.value
 					setInput(input)