HoovesSocial/hippofish
2
0
Fork 0
Code Issues 3 Pull requests 1 Projects Releases Packages Wiki Activity Actions

Merge branch 'fix/click' into 'develop'

Browse source 
fix: Click event of MenuParent unexpectedly goes to underlying element

Co-authored-by: Lhcfl <Lhcfl@outlook.com>

See merge request firefish/firefish!10792
This commit is contained in:
naskya 2024-05-05 11:42:25 +00:00
commit 9a4a75bf92
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
packages/client/src/components/MkMenu.vue
View file

@ -130,7 +130,7 @@
v-else-if="item.type === 'parent'" v-else-if="item.type === 'parent'"
class="_button item parent" class="_button item parent"
:class="{ childShowing: childShowingItem === item }" :class="{ childShowing: childShowingItem === item }"
@mouseenter="showChildren(item, $event)" @mouseenter.passive="showChildren(item, $event)"
@click.stop="showChildren(item, $event)" @click.stop="showChildren(item, $event)"
> >
<i <i
@ -318,6 +318,7 @@ function onItemMouseLeave(_item) {
async function showChildren(item: MenuParent, ev: MouseEvent) { async function showChildren(item: MenuParent, ev: MouseEvent) {
if (props.asDrawer) { if (props.asDrawer) {
if (ev.type === "mouseenter") return;
os.popupMenu(item.children, (ev.currentTarget ?? ev.target) as HTMLElement); os.popupMenu(item.children, (ev.currentTarget ?? ev.target) as HTMLElement);
close(); close();
} else { } else {