From bd470596ccdb621b290b240071d3d2a525b3e743 Mon Sep 17 00:00:00 2001
From: Mar0xy <marie@kaifa.ch>
Date: Tue, 28 Nov 2023 03:01:37 +0100
Subject: [PATCH] upd: collapse mentions if multiple are followed in a row

---
 .../frontend/src/components/MkMention.vue     | 44 ++++++++++++++++++-
 .../global/MkMisskeyFlavoredMarkdown.ts       |  8 +++-
 2 files changed, 50 insertions(+), 2 deletions(-)

diff --git a/packages/frontend/src/components/MkMention.vue b/packages/frontend/src/components/MkMention.vue
index 4d42053657..3319835a30 100644
--- a/packages/frontend/src/components/MkMention.vue
+++ b/packages/frontend/src/components/MkMention.vue
@@ -4,7 +4,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 -->
 
 <template>
-<MkA v-user-preview="canonical" :class="[$style.root, { [$style.isMe]: isMe }]" :to="url" :style="{ background: bgCss }">
+<MkA v-user-preview="canonical" :class="[{ [$style.root]: !first, [$style.altRoot]: first, [$style.isMe]: isMe }]" :to="url" :style="{ background: bgCss }">
 	<img :class="$style.icon" :src="avatarUrl" alt="">
 	<span>
 		<span>@{{ username }}</span>
@@ -25,6 +25,7 @@ import { getStaticImageUrl } from '@/scripts/media-proxy.js';
 const props = defineProps<{
 	username: string;
 	host: string;
+	first?: boolean;
 }>();
 
 const canonical = props.host === localHost ? `@${props.username}` : `@${props.username}@${toUnicode(props.host)}`;
@@ -57,6 +58,47 @@ const avatarUrl = computed(() => defaultStore.state.disableShowingAnimatedImages
 	}
 }
 
+.root + .root {
+  position: relative;
+  margin-inline: -20px 0;
+  box-shadow: -4px 0 0 var(--panel), -15px 0 15px var(--panel);
+  overflow: clip;
+  isolation: isolate;
+
+  &::before {
+    content: "";
+    position: absolute;
+    inset: 0;
+    background: var(--panel);
+    z-index: -1;
+  }
+
+  &::after {
+    content: "";
+    position: absolute;
+    inset: 0;
+    background: var(--panel);
+    z-index: -1;
+    background: inherit;
+  }
+
+  span {
+    display: inline-block;
+    white-space: nowrap;
+    max-width: 3em;
+    mask: linear-gradient(to right, #000 20%, rgba(0, 0, 0, 0.4));
+  }
+
+  + .root {
+    margin-inline: -10px 0;
+    padding-inline-end: 0;
+    box-shadow: -4px 0 0 var(--panel);
+
+    span {
+      display: none;
+    }
+  }
+}
 .icon {
 	width: 1.5em;
 	height: 1.5em;
diff --git a/packages/frontend/src/components/global/MkMisskeyFlavoredMarkdown.ts b/packages/frontend/src/components/global/MkMisskeyFlavoredMarkdown.ts
index 7d55353d98..d437ea9985 100644
--- a/packages/frontend/src/components/global/MkMisskeyFlavoredMarkdown.ts
+++ b/packages/frontend/src/components/global/MkMisskeyFlavoredMarkdown.ts
@@ -82,7 +82,13 @@ export default function(props: MfmProps) {
 						res.push(t);
 					}
 					res.shift();
-					return res;
+
+					// Don't wrap whitespaces in a span
+					if (text === ' ') {
+						return res;
+					}
+
+					return h('span', res);
 				} else {
 					return [text.replace(/\n/g, ' ')];
 				}