From f5884957a53e7fa4ba2a8da62c65e8ddd4bf0bf4 Mon Sep 17 00:00:00 2001
From: Richard Lewis <richrd.lewis@gmail.com>
Date: Wed, 22 Jan 2020 18:42:31 +0200
Subject: [PATCH] Fix CSS styles, scroll to selected channel and improve
 bindings.

Co-Authored-By: Pavel Djundik <xPaw@users.noreply.github.com>
---
 client/components/App.vue         |  4 ----
 client/components/NetworkList.vue | 26 ++++++++++++++++----------
 client/js/vue.js                  |  1 +
 3 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/client/components/App.vue b/client/components/App.vue
index cf1460e5..01b21705 100644
--- a/client/components/App.vue
+++ b/client/components/App.vue
@@ -9,10 +9,6 @@
 	</div>
 </template>
 
-<style>
-@import "../css/style.css";
-</style>
-
 <script>
 const constants = require("../js/constants");
 import Mousetrap from "mousetrap";
diff --git a/client/components/NetworkList.vue b/client/components/NetworkList.vue
index 0fc7a4e5..e04d18d8 100644
--- a/client/components/NetworkList.vue
+++ b/client/components/NetworkList.vue
@@ -2,7 +2,7 @@
 	<div v-if="networks.length === 0" class="empty">
 		You are not connected to any networks yet.
 	</div>
-	<div v-else>
+	<div v-else ref="networklist">
 		<div class="jump-to-input">
 			<input
 				ref="searchInput"
@@ -23,11 +23,11 @@
 			/>
 		</div>
 		<div v-if="searchText" class="jump-to-results">
-			<div v-if="results.length" ref="results">
+			<div v-if="results.length">
 				<div
 					v-for="item in results"
 					:key="item.channel.id"
-					v-on="{mouseover: () => setActiveSearchItem(item.channel)}"
+					@mouseenter="setActiveSearchItem(item.channel)"
 					@click.prevent="selectResult"
 				>
 					<Channel
@@ -127,7 +127,7 @@
 	margin: 0;
 	width: 100%;
 	border: 0;
-	color: inherit;
+	color: #fff;
 	background-color: rgba(255, 255, 255, 0.1);
 	padding-right: 35px;
 }
@@ -299,21 +299,26 @@ export default {
 			});
 		},
 		toggleSearch(event) {
-			event.preventDefault();
+			// Do not handle this keybind in the chat input because
+			// it can be used to type letters with umlauts
+			if (event.target.tagName === "TEXTAREA") {
+				return true;
+			}
 
 			if (this.$refs.searchInput === document.activeElement) {
-				this.closeSearch();
-				return;
+				this.deactivateSearch();
+				return false;
 			}
 
 			this.activateSearch();
+			return false;
 		},
 		activateSearch() {
 			if (this.$refs.searchInput === document.activeElement) {
 				return;
 			}
 
-			this.sidebarWasOpen = this.$store.state.sidebarOpen;
+			this.sidebarWasClosed = this.$store.state.sidebarOpen ? false : true;
 			this.$store.commit("sidebarOpen", true);
 			this.$nextTick(() => {
 				this.$refs.searchInput.focus();
@@ -324,7 +329,7 @@ export default {
 			this.searchText = "";
 			this.$refs.searchInput.blur();
 
-			if (!this.sidebarWasOpen) {
+			if (this.sidebarWasClosed) {
 				this.$store.commit("sidebarOpen", false);
 			}
 		},
@@ -349,6 +354,7 @@ export default {
 
 			this.$root.switchToChannel(this.activeSearchItem);
 			this.deactivateSearch();
+			this.scrollToActive();
 		},
 		navigateResults(event, direction) {
 			// Prevent propagation to stop global keybind handler from capturing pagedown/pageup
@@ -395,7 +401,7 @@ export default {
 		scrollToActive() {
 			// Scroll the list if needed after the active class is applied
 			this.$nextTick(() => {
-				const el = this.$refs.results.querySelector(".active-result");
+				const el = this.$refs.networklist.querySelector(".channel-list-item.active");
 
 				if (el) {
 					el.scrollIntoView({block: "nearest", inline: "nearest"});
diff --git a/client/js/vue.js b/client/js/vue.js
index 91f10665..ee6940b4 100644
--- a/client/js/vue.js
+++ b/client/js/vue.js
@@ -2,6 +2,7 @@
 
 const constants = require("./constants");
 
+import "../css/style.css";
 import Vue from "vue";
 import store from "./store";
 import App from "../components/App.vue";