From ba7531121bc021e740cdbc022340554a130f686d Mon Sep 17 00:00:00 2001 From: Keavon Chambers Date: Mon, 19 Jul 2021 15:03:08 -0700 Subject: [PATCH] Fix dropdown menu widget showing wrong active entry Fixes #250 --- .../src/components/widgets/floating-menus/MenuList.vue | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/client/web/src/components/widgets/floating-menus/MenuList.vue b/client/web/src/components/widgets/floating-menus/MenuList.vue index 05d4ad28..b596c470 100644 --- a/client/web/src/components/widgets/floating-menus/MenuList.vue +++ b/client/web/src/components/widgets/floating-menus/MenuList.vue @@ -6,7 +6,7 @@ v-for="(entry, entryIndex) in section" :key="entryIndex" class="row" - :class="{ open: isMenuEntryOpen(entry), active: entry === currentEntry }" + :class="{ open: isMenuEntryOpen(entry), active: entry === activeEntry }" @click="handleEntryClick(entry)" @mouseenter="handleEntryMouseEnter(entry)" @mouseleave="handleEntryMouseLeave(entry)" @@ -23,10 +23,7 @@ v-if="entry.children" :direction="MenuDirection.TopRight" :menuEntries="entry.children" - v-model:active-entry="currentEntry" - :minWidth="minWidth" - :drawIcon="drawIcon" - :scrollable="scrollable" + v-bind="{ defaultAction, minWidth, drawIcon, scrollable }" :ref="(ref) => setEntryRefs(entry, ref)" /> @@ -248,7 +245,6 @@ const MenuList = defineComponent({ }, data() { return { - currentEntry: this.activeEntry, keyboardLockInfoMessage: keyboardLockApiSupported() ? KEYBOARD_LOCK_USE_FULLSCREEN : KEYBOARD_LOCK_SWITCH_BROWSER, SeparatorDirection, SeparatorType,