From a2f04f4c28cbed64c35d48d128e3faf59fc17778 Mon Sep 17 00:00:00 2001
From: Rijk van Zanten <rijkvanzanten@me.com>
Date: Fri, 1 May 2020 15:08:16 -0400
Subject: [PATCH] Fix v-menu active state (#514)

---
 src/components/v-menu/v-menu.vue | 19 ++++++++++++++-----
 src/interfaces/icon/icon.vue     |  4 ++--
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/src/components/v-menu/v-menu.vue b/src/components/v-menu/v-menu.vue
index 3ecc36ddd3..6c094e28c6 100644
--- a/src/components/v-menu/v-menu.vue
+++ b/src/components/v-menu/v-menu.vue
@@ -7,7 +7,15 @@
 		}"
 	>
 		<div ref="activator" class="v-menu-activator" :class="{ attached }">
-			<slot name="activator" v-bind="{ toggle: toggle, active: isActive }" />
+			<slot
+				name="activator"
+				v-bind="{
+					toggle: toggle,
+					active: isActive,
+					activate: activate,
+					deactivate: deactivate,
+				}"
+			/>
 		</div>
 
 		<div
@@ -92,7 +100,7 @@ export default defineComponent({
 			}))
 		);
 
-		const { isActive, deactivate, toggle } = useActiveState();
+		const { isActive, activate, deactivate, toggle } = useActiveState();
 
 		return {
 			activator,
@@ -105,6 +113,7 @@ export default defineComponent({
 			styles,
 			arrowStyles,
 			popperPlacement,
+			activate,
 		};
 
 		function useActiveState() {
@@ -124,8 +133,8 @@ export default defineComponent({
 						stop();
 					}
 
-					emit('input', newActive);
 					localIsActive.value = newActive;
+					emit('input', newActive);
 				},
 			});
 
@@ -139,9 +148,9 @@ export default defineComponent({
 				isActive.value = false;
 			}
 
-			function toggle(newActive = !isActive.value) {
+			function toggle() {
 				if (props.disabled === true) return;
-				isActive.value = newActive;
+				isActive.value = !isActive.value;
 			}
 		}
 
diff --git a/src/interfaces/icon/icon.vue b/src/interfaces/icon/icon.vue
index 93c3986a36..18e89b6c8f 100644
--- a/src/interfaces/icon/icon.vue
+++ b/src/interfaces/icon/icon.vue
@@ -1,11 +1,11 @@
 <template>
 	<v-menu attached :disabled="disabled" close-on-content-click>
-		<template #activator="{ toggle, active }">
+		<template #activator="{ toggle, active, activate }">
 			<v-input
 				:disabled="disabled"
 				:placeholder="value || $t('search_for_icon')"
 				v-model="searchQuery"
-				@focus="toggle(true)"
+				@focus="activate"
 			>
 				<template #prepend>
 					<v-icon :name="value" :class="{ active: value }" />