From 1be08d76dd237c67df16bdefc524e606bfba9312 Mon Sep 17 00:00:00 2001
From: Terry Truong <terry06890@gmail.com>
Date: Mon, 11 Jul 2022 13:46:10 +1000
Subject: Fix search-mode not closing on Esc

---
 src/App.vue                  | 8 +++++---
 src/components/HelpModal.vue | 3 ++-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 4285f6a..4f93cee 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -63,8 +63,10 @@
 		<help-modal v-if="helpOpen" :tutOpen="tutPaneOpen" :uiOpts="uiOpts" class="z-10"
 			@close="onHelpClose" @start-tutorial="onStartTutorial"/>
 	</transition>
-	<settings-modal v-if="settingsOpen" :lytOpts="lytOpts" :uiOpts="uiOpts" class="z-10"
-		@close="onSettingsClose" @reset="onResetSettings" @setting-chg="onSettingChg"/>
+	<transition name="fade">
+		<settings-modal v-if="settingsOpen" :lytOpts="lytOpts" :uiOpts="uiOpts" class="z-10"
+			@close="onSettingsClose" @reset="onResetSettings" @setting-chg="onSettingChg"/>
+	</transition>
 	<transition name="fade">
 		<loading-modal v-if="loadingMsg != null" :msg="loadingMsg" :uiOpts="uiOpts" class="z-10"/>
 	</transition>
@@ -829,7 +831,7 @@ export default defineComponent({
 			if (this.infoModalNodeName != null){
 				this.onInfoClose();
 			}
-			if (this.searchOpen){
+			if (this.searchOpen || this.modeRunning == 'search'){
 				this.onSearchClose();
 			}
 			if (this.modeRunning == 'autoMode'){
diff --git a/src/components/HelpModal.vue b/src/components/HelpModal.vue
index cc11afb..b37d954 100644
--- a/src/components/HelpModal.vue
+++ b/src/components/HelpModal.vue
@@ -1,5 +1,6 @@
 <template>
-<div class="fixed left-0 top-0 w-full h-full bg-black/40" @click="onClose">
+<div class="fixed left-0 top-0 w-full h-full bg-black/20" @click="onClose">
+	<!-- Outer div is slightly less dark to make scrollbar more distinguishable -->
 	<div class="absolute left-1/2 -translate-x-1/2 top-1/2 -translate-y-1/2
 		w-[90%] max-w-[16cm] max-h-[80%] overflow-auto" :style="styles">
 		<close-icon @click.stop="onClose" ref="closeIcon"
-- 
cgit v1.2.3