From 19cba1a12a210a3ac28ad2d5fa34a2ea1952a291 Mon Sep 17 00:00:00 2001
From: tess <me@thvxl.se>
Date: Mon, 6 May 2024 23:59:42 +0200
Subject: [PATCH] fix: only stop event propagation in MkEmoji and MkCustomEmoji
 when menu prop is passed

---
 packages/frontend/src/components/global/MkCustomEmoji.vue | 1 +
 packages/frontend/src/components/global/MkEmoji.vue       | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/frontend/src/components/global/MkCustomEmoji.vue b/packages/frontend/src/components/global/MkCustomEmoji.vue
index b57a311c0c..8ba4e396b7 100644
--- a/packages/frontend/src/components/global/MkCustomEmoji.vue
+++ b/packages/frontend/src/components/global/MkCustomEmoji.vue
@@ -85,6 +85,7 @@ const errored = ref(url.value == null);
 
 function onClick(ev: MouseEvent) {
 	if (props.menu) {
+		ev.stopPropagation();
 		os.popupMenu([{
 			type: 'label',
 			text: `:${props.name}:`,
diff --git a/packages/frontend/src/components/global/MkEmoji.vue b/packages/frontend/src/components/global/MkEmoji.vue
index 2e7a0c5bb7..b6b5aaba32 100644
--- a/packages/frontend/src/components/global/MkEmoji.vue
+++ b/packages/frontend/src/components/global/MkEmoji.vue
@@ -4,8 +4,8 @@ SPDX-License-Identifier: AGPL-3.0-only
 -->
 
 <template>
-<img v-if="!useOsNativeEmojis" :class="$style.root" :src="url" :alt="props.emoji" decoding="async" @pointerenter="computeTitle" @click="onClick" v-on:click.stop/>
-<span v-else :alt="props.emoji" @pointerenter="computeTitle" @click="onClick" v-on:click.stop>{{ colorizedNativeEmoji }}</span>
+<img v-if="!useOsNativeEmojis" :class="$style.root" :src="url" :alt="props.emoji" decoding="async" @pointerenter="computeTitle" @click="onClick"/>
+<span v-else :alt="props.emoji" @pointerenter="computeTitle" @click="onClick">{{ colorizedNativeEmoji }}</span>
 </template>
 
 <script lang="ts" setup>
@@ -39,6 +39,7 @@ function computeTitle(event: PointerEvent): void {
 
 function onClick(ev: MouseEvent) {
 	if (props.menu) {
+		ev.stopPropagation();
 		os.popupMenu([{
 			type: 'label',
 			text: props.emoji,