From d8a6ce64a36426961481293a56cb2e1daf339478 Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Fri, 28 Apr 2023 21:39:48 -0400
Subject: [PATCH] Fix focusing avatars in weird places
---
packages/client/src/components/MkMenu.vue | 4 +++-
packages/client/src/components/MkUserSelectDialog.vue | 2 ++
packages/client/src/components/MkUsersTooltip.vue | 2 +-
packages/client/src/components/global/MkPageHeader.vue | 2 ++
packages/client/src/pages/admin/overview.moderators.vue | 2 +-
packages/client/src/pages/follow-requests.vue | 1 +
packages/client/src/ui/_common_/navbar-for-mobile.vue | 1 +
packages/client/src/ui/_common_/navbar.vue | 1 +
packages/client/src/ui/classic.header.vue | 1 +
packages/client/src/ui/classic.sidebar.vue | 1 +
10 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/packages/client/src/components/MkMenu.vue b/packages/client/src/components/MkMenu.vue
index f22f0f9ca..0b5fb7455 100644
--- a/packages/client/src/components/MkMenu.vue
+++ b/packages/client/src/components/MkMenu.vue
@@ -46,6 +46,7 @@
v-if="item.avatar"
:user="item.avatar"
class="avatar"
+ disableLink
/>
<span :style="item.textStyle || ''">{{ item.text }}</span>
<span v-if="item.indicate" class="indicator"
@@ -88,7 +89,7 @@
@mouseenter.passive="onItemMouseEnter(item)"
@mouseleave.passive="onItemMouseLeave(item)"
>
- <MkAvatar :user="item.user" class="avatar" /><MkUserName
+ <MkAvatar :user="item.user" class="avatar" disableLink /><MkUserName
:user="item.user"
/>
<span v-if="item.indicate" class="indicator"
@@ -157,6 +158,7 @@
v-if="item.avatar"
:user="item.avatar"
class="avatar"
+ disableLink
/>
<span :style="item.textStyle || ''">{{ item.text }}</span>
<span v-if="item.indicate" class="indicator"
diff --git a/packages/client/src/components/MkUserSelectDialog.vue b/packages/client/src/components/MkUserSelectDialog.vue
index 506f48bd4..14553ca46 100644
--- a/packages/client/src/components/MkUserSelectDialog.vue
+++ b/packages/client/src/components/MkUserSelectDialog.vue
@@ -46,6 +46,7 @@
:user="user"
class="avatar"
:show-indicator="true"
+ disableLink
/>
<div class="body">
<MkUserName :user="user" class="name" />
@@ -73,6 +74,7 @@
:user="user"
class="avatar"
:show-indicator="true"
+ disableLink
/>
<div class="body">
<MkUserName :user="user" class="name" />
diff --git a/packages/client/src/components/MkUsersTooltip.vue b/packages/client/src/components/MkUsersTooltip.vue
index 972864d1f..78a4f90f2 100644
--- a/packages/client/src/components/MkUsersTooltip.vue
+++ b/packages/client/src/components/MkUsersTooltip.vue
@@ -7,7 +7,7 @@
>
<div class="beaffaef">
<div v-for="u in users" :key="u.id" class="user">
- <MkAvatar class="avatar" :user="u" />
+ <MkAvatar class="avatar" :user="u" disableLink />
<MkUserName class="name" :user="u" :nowrap="true" />
</div>
<div v-if="users.length < count" class="omitted">
diff --git a/packages/client/src/components/global/MkPageHeader.vue b/packages/client/src/components/global/MkPageHeader.vue
index ad1d80ca6..c78ef0c10 100644
--- a/packages/client/src/components/global/MkPageHeader.vue
+++ b/packages/client/src/components/global/MkPageHeader.vue
@@ -19,6 +19,7 @@
class="avatar"
:user="$i"
:disable-preview="true"
+ disableLink
/>
</div>
<template v-if="metadata">
@@ -33,6 +34,7 @@
:user="metadata.avatar"
:disable-preview="true"
:show-indicator="true"
+ disableLink
/>
<i
v-else-if="metadata.icon && !narrow"
diff --git a/packages/client/src/pages/admin/overview.moderators.vue b/packages/client/src/pages/admin/overview.moderators.vue
index 6184cfb10..db953b890 100644
--- a/packages/client/src/pages/admin/overview.moderators.vue
+++ b/packages/client/src/pages/admin/overview.moderators.vue
@@ -12,7 +12,7 @@
class="user"
:to="`/user-info/${user.id}`"
>
- <MkAvatar :user="user" class="avatar" indicator />
+ <MkAvatar :user="user" class="avatar" indicator disableLink />
</MkA>
</div>
</Transition>
diff --git a/packages/client/src/pages/follow-requests.vue b/packages/client/src/pages/follow-requests.vue
index 2aac52163..35279495b 100644
--- a/packages/client/src/pages/follow-requests.vue
+++ b/packages/client/src/pages/follow-requests.vue
@@ -23,6 +23,7 @@
class="avatar"
:user="req.follower"
:show-indicator="true"
+ disableLink
/>
<div class="body">
<div class="name">
diff --git a/packages/client/src/ui/_common_/navbar-for-mobile.vue b/packages/client/src/ui/_common_/navbar-for-mobile.vue
index 43c91d147..39abb7c26 100644
--- a/packages/client/src/ui/_common_/navbar-for-mobile.vue
+++ b/packages/client/src/ui/_common_/navbar-for-mobile.vue
@@ -18,6 +18,7 @@
<MkAvatar
:user="$i"
class="icon"
+ disableLink
/><!-- <MkAcct class="text" :user="$i"/> -->
</button>
</div>
diff --git a/packages/client/src/ui/_common_/navbar.vue b/packages/client/src/ui/_common_/navbar.vue
index 1c69067e1..4fb27a071 100644
--- a/packages/client/src/ui/_common_/navbar.vue
+++ b/packages/client/src/ui/_common_/navbar.vue
@@ -18,6 +18,7 @@
<MkAvatar
:user="$i"
class="icon"
+ disableLink
/><!-- <MkAcct class="text" :user="$i"/> -->
</button>
</div>
diff --git a/packages/client/src/ui/classic.header.vue b/packages/client/src/ui/classic.header.vue
index 5c3e6b702..99a0ab098 100644
--- a/packages/client/src/ui/classic.header.vue
+++ b/packages/client/src/ui/classic.header.vue
@@ -83,6 +83,7 @@
<MkAvatar :user="$i" class="avatar" /><MkAcct
class="acct"
:user="$i"
+ disableLink
/>
</button>
<div class="post" @click="post">
diff --git a/packages/client/src/ui/classic.sidebar.vue b/packages/client/src/ui/classic.sidebar.vue
index b70a3c984..33aa62ed7 100644
--- a/packages/client/src/ui/classic.sidebar.vue
+++ b/packages/client/src/ui/classic.sidebar.vue
@@ -8,6 +8,7 @@
<MkAvatar :user="$i" class="avatar" /><MkAcct
class="text"
:user="$i"
+ disableLink
/>
</button>
<div class="post" data-cy-open-post-form @click="post">