From acab9ccb81842a9836df8d54b9a10cf0b83a2837 Mon Sep 17 00:00:00 2001
From: 1Step621 <86859447+1STEP621@users.noreply.github.com>
Date: Wed, 17 Jan 2024 14:29:24 +0900
Subject: [PATCH] =?UTF-8?q?Enhance(frontend):=20MkCustomEmojiDetailedDialo?=
=?UTF-8?q?g=E3=82=92=E8=AA=BF=E6=95=B4=20(#13015)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
* MkEmojiDetailedDialogを調整
* 絵文字ライセンスでMFMを使えるように
* <a> -> <MkLink>
* 入力ボックスでmfmのオートコンプリートを効かせる
---
.../src/components/MkCustomEmojiDetailedDialog.vue | 10 ++++++----
packages/frontend/src/pages/emoji-edit-dialog.vue | 2 +-
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/packages/frontend/src/components/MkCustomEmojiDetailedDialog.vue b/packages/frontend/src/components/MkCustomEmojiDetailedDialog.vue
index c53bbca37c..1952369b6d 100644
--- a/packages/frontend/src/components/MkCustomEmojiDetailedDialog.vue
+++ b/packages/frontend/src/components/MkCustomEmojiDetailedDialog.vue
@@ -10,9 +10,9 @@ SPDX-License-Identifier: AGPL-3.0-only
<MkSpacer>
<div style="display: flex; flex-direction: column; gap: 1em;">
<div :class="$style.emojiImgWrapper">
- <MkCustomEmoji :name="emoji.name" :normal="true" style="height: 100%;"></MkCustomEmoji>
+ <MkCustomEmoji :name="emoji.name" :normal="true" :useOriginalSize="true" style="height: 100%;"></MkCustomEmoji>
</div>
- <MkKeyValue>
+ <MkKeyValue :copy="`:${emoji.name}:`">
<template #key>{{ i18n.ts.name }}</template>
<template #value>{{ emoji.name }}</template>
</MkKeyValue>
@@ -41,12 +41,12 @@ SPDX-License-Identifier: AGPL-3.0-only
</MkKeyValue>
<MkKeyValue>
<template #key>{{ i18n.ts.license }}</template>
- <template #value>{{ emoji.license ?? i18n.ts.none }}</template>
+ <template #value><Mfm :text="emoji.license ?? i18n.ts.none" /></template>
</MkKeyValue>
<MkKeyValue :copy="emoji.url">
<template #key>{{ i18n.ts.emojiUrl }}</template>
<template #value>
- <a :href="emoji.url" target="_blank">{{ emoji.url }}</a>
+ <MkLink :url="emoji.url" target="_blank">{{ emoji.url }}</MkLink>
</template>
</MkKeyValue>
</div>
@@ -61,6 +61,7 @@ import { defineProps, shallowRef } from 'vue';
import { i18n } from '@/i18n.js';
import MkModalWindow from '@/components/MkModalWindow.vue';
import MkKeyValue from '@/components/MkKeyValue.vue';
+import MkLink from './MkLink.vue';
const props = defineProps<{
emoji: Misskey.entities.EmojiDetailed,
}>();
@@ -94,6 +95,7 @@ const cancel = () => {
.alias {
display: inline-block;
+ word-break: break-all;
padding: 3px 10px;
background-color: var(--X5);
border: solid 1px var(--divider);
diff --git a/packages/frontend/src/pages/emoji-edit-dialog.vue b/packages/frontend/src/pages/emoji-edit-dialog.vue
index e00953c1ff..1ef150bc2d 100644
--- a/packages/frontend/src/pages/emoji-edit-dialog.vue
+++ b/packages/frontend/src/pages/emoji-edit-dialog.vue
@@ -44,7 +44,7 @@ SPDX-License-Identifier: AGPL-3.0-only
{{ i18n.ts.setMultipleBySeparatingWithSpace }}
</template>
</MkInput>
- <MkInput v-model="license">
+ <MkInput v-model="license" :mfmAutocomplete="true">
<template #label>{{ i18n.ts.license }}</template>
</MkInput>
<MkFolder>