natty
/
misskey-awawa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor

This commit is contained in:
syuilo 2023-05-29 18:22:15 +09:00
parent f469f555e8
commit 3097bb6c7d
1 changed files with 303 additions and 375 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

286
packages/frontend/src/components/MkNoteDetailed.vue
View File

@ -4,25 +4,25 @@
v-show="!isDeleted" v-show="!isDeleted"
ref="el" ref="el"
v-hotkey="keymap" v-hotkey="keymap"
class="lxwezrsl" :class="[$style.root, { [$style.renote]: isRenote }]"
:tabindex="!isDeleted ? '-1' : null"
:class="{ renote: isRenote }"
> >
<MkNoteSub v-for="note in conversation" :key="note.id" class="reply-to-more" :note="note"/> <MkNoteSub v-for="note in conversation" :key="note.id" :class="$style.replyToMore" :note="note"/>
<MkNoteSub v-if="appearNote.reply" :note="appearNote.reply" class="reply-to"/> <MkNoteSub v-if="appearNote.reply" :note="appearNote.reply" :class="$style.replyTo"/>
<div v-if="isRenote" class="renote"> <div v-if="isRenote" :class="$style.renote">
<MkAvatar class="avatar" :user="note.user" link preview/> <MkAvatar :class="$style.renoteAvatar" :user="note.user" link preview/>
<i class="ti ti-repeat"></i> <i class="ti ti-repeat" style="margin-right: 4px;"></i>
<span :class="$style.renoteText">
<I18n :src="i18n.ts.renotedBy" tag="span"> <I18n :src="i18n.ts.renotedBy" tag="span">
<template #user> <template #user>
<MkA v-user-preview="note.userId" class="name" :to="userPage(note.user)"> <MkA v-user-preview="note.userId" :class="$style.renoteName" :to="userPage(note.user)">
<MkUserName :user="note.user"/> <MkUserName :user="note.user"/>
</MkA> </MkA>
</template> </template>
</I18n> </I18n>
<div class="info"> </span>
<button ref="renoteTime" class="_button time" @click="showRenoteMenu()"> <div :class="$style.renoteInfo">
<i v-if="isMyRenote" class="ti ti-dots dropdownIcon"></i> <button ref="renoteTime" class="_button" :class="$style.renoteTime" @click="showRenoteMenu()">
<i v-if="isMyRenote" class="ti ti-dots" style="margin-right: 4px;"></i>
<MkTime :time="note.createdAt"/> <MkTime :time="note.createdAt"/>
</button> </button>
<span v-if="note.visibility !== 'public'" style="margin-left: 0.5em;" :title="i18n.ts._visibility[note.visibility]"> <span v-if="note.visibility !== 'public'" style="margin-left: 0.5em;" :title="i18n.ts._visibility[note.visibility]">
@ -33,16 +33,16 @@
<span v-if="note.localOnly" style="margin-left: 0.5em;" :title="i18n.ts._visibility['disableFederation']"><i class="ti ti-rocket-off"></i></span> <span v-if="note.localOnly" style="margin-left: 0.5em;" :title="i18n.ts._visibility['disableFederation']"><i class="ti ti-rocket-off"></i></span>
</div> </div>
</div> </div>
<article class="article" @contextmenu.stop="onContextmenu"> <article :class="$style.note" @contextmenu.stop="onContextmenu">
<header class="header"> <header :class="$style.noteHeader">
<MkAvatar class="avatar" :user="appearNote.user" indicator link preview/> <MkAvatar :class="$style.noteHeaderAvatar" :user="appearNote.user" indicator link preview/>
<div class="body"> <div :class="$style.noteHeaderBody">
<div class="top"> <div>
<MkA v-user-preview="appearNote.user.id" class="name" :to="userPage(appearNote.user)"> <MkA v-user-preview="appearNote.user.id" :class="$style.noteHeaderName" :to="userPage(appearNote.user)">
<MkUserName :nowrap="false" :user="appearNote.user"/> <MkUserName :nowrap="false" :user="appearNote.user"/>
</MkA> </MkA>
<span v-if="appearNote.user.isBot" class="is-bot">bot</span> <span v-if="appearNote.user.isBot" :class="$style.isBot">bot</span>
<div class="info"> <div :class="$style.noteHeaderInfo">
<span v-if="appearNote.visibility !== 'public'" style="margin-left: 0.5em;" :title="i18n.ts._visibility[appearNote.visibility]"> <span v-if="appearNote.visibility !== 'public'" style="margin-left: 0.5em;" :title="i18n.ts._visibility[appearNote.visibility]">
<i v-if="appearNote.visibility === 'home'" class="ti ti-home"></i> <i v-if="appearNote.visibility === 'home'" class="ti ti-home"></i>
<i v-else-if="appearNote.visibility === 'followers'" class="ti ti-lock"></i> <i v-else-if="appearNote.visibility === 'followers'" class="ti ti-lock"></i>
@ -51,84 +51,81 @@
<span v-if="appearNote.localOnly" style="margin-left: 0.5em;" :title="i18n.ts._visibility['disableFederation']"><i class="ti ti-rocket-off"></i></span> <span v-if="appearNote.localOnly" style="margin-left: 0.5em;" :title="i18n.ts._visibility['disableFederation']"><i class="ti ti-rocket-off"></i></span>
</div> </div>
</div> </div>
<div class="username"><MkAcct :user="appearNote.user"/></div> <div :class="$style.noteHeaderUsername"><MkAcct :user="appearNote.user"/></div>
<MkInstanceTicker v-if="showTicker" class="ticker" :instance="appearNote.user.instance"/> <MkInstanceTicker v-if="showTicker" :class="$style.ticker" :instance="appearNote.user.instance"/>
</div> </div>
</header> </header>
<div class="main"> <div :class="$style.noteContent">
<div class="body"> <p v-if="appearNote.cw != null" :class="$style.cw">
<p v-if="appearNote.cw != null" class="cw"> <Mfm v-if="appearNote.cw != ''" style="margin-right: 8px;" :text="appearNote.cw" :author="appearNote.user" :i="$i"/>
<Mfm v-if="appearNote.cw != ''" class="text" :text="appearNote.cw" :author="appearNote.user" :i="$i"/>
<MkCwButton v-model="showContent" :note="appearNote"/> <MkCwButton v-model="showContent" :note="appearNote"/>
</p> </p>
<div v-show="appearNote.cw == null || showContent" class="content"> <div v-show="appearNote.cw == null || showContent">
<div class="text">
<span v-if="appearNote.isHidden" style="opacity: 0.5">({{ i18n.ts.private }})</span> <span v-if="appearNote.isHidden" style="opacity: 0.5">({{ i18n.ts.private }})</span>
<MkA v-if="appearNote.replyId" class="reply" :to="`/notes/${appearNote.replyId}`"><i class="ti ti-arrow-back-up"></i></MkA> <MkA v-if="appearNote.replyId" :class="$style.noteReplyTarget" :to="`/notes/${appearNote.replyId}`"><i class="ti ti-arrow-back-up"></i></MkA>
<Mfm v-if="appearNote.text" :text="appearNote.text" :author="appearNote.user" :i="$i" :emojiUrls="appearNote.emojis"/> <Mfm v-if="appearNote.text" :text="appearNote.text" :author="appearNote.user" :i="$i" :emojiUrls="appearNote.emojis"/>
<a v-if="appearNote.renote != null" class="rp">RN:</a> <a v-if="appearNote.renote != null" :class="$style.rn">RN:</a>
<div v-if="translating || translation" class="translation"> <div v-if="translating || translation" :class="$style.translation">
<MkLoading v-if="translating" mini/> <MkLoading v-if="translating" mini/>
<div v-else class="translated"> <div v-else>
<b>{{ i18n.t('translatedFrom', { x: translation.sourceLang }) }}: </b> <b>{{ i18n.t('translatedFrom', { x: translation.sourceLang }) }}: </b>
<Mfm :text="translation.text" :author="appearNote.user" :i="$i" :emojiUrls="appearNote.emojis"/> <Mfm :text="translation.text" :author="appearNote.user" :i="$i" :emojiUrls="appearNote.emojis"/>
</div> </div>
</div> </div>
</div> <div v-if="appearNote.files.length > 0" :class="$style.files">
<div v-if="appearNote.files.length > 0" class="files">
<MkMediaList :mediaList="appearNote.files"/> <MkMediaList :mediaList="appearNote.files"/>
</div> </div>
<MkPoll v-if="appearNote.poll" ref="pollViewer" :note="appearNote" class="poll"/> <MkPoll v-if="appearNote.poll" ref="pollViewer" :note="appearNote" :class="$style.poll"/>
<MkUrlPreview v-for="url in urls" :key="url" :url="url" :compact="true" :detail="true" class="url-preview"/> <MkUrlPreview v-for="url in urls" :key="url" :url="url" :compact="true" :detail="true" style="margin-top: 6px;"/>
<div v-if="appearNote.renote" class="renote"><MkNoteSimple :note="appearNote.renote" class="note"/></div> <div v-if="appearNote.renote" :class="$style.quote"><MkNoteSimple :note="appearNote.renote" :class="$style.quoteNote"/></div>
</div> </div>
<MkA v-if="appearNote.channel && !inChannel" class="channel" :to="`/channels/${appearNote.channel.id}`"><i class="ti ti-device-tv"></i> {{ appearNote.channel.name }}</MkA> <MkA v-if="appearNote.channel && !inChannel" :class="$style.channel" :to="`/channels/${appearNote.channel.id}`"><i class="ti ti-device-tv"></i> {{ appearNote.channel.name }}</MkA>
</div> </div>
<footer class="footer"> <footer>
<div class="info"> <div :class="$style.noteFooterInfo">
<MkA class="created-at" :to="notePage(appearNote)"> <MkA :to="notePage(appearNote)">
<MkTime :time="appearNote.createdAt" mode="detail"/> <MkTime :time="appearNote.createdAt" mode="detail"/>
</MkA> </MkA>
</div> </div>
<MkReactionsViewer ref="reactionsViewer" :note="appearNote"/> <MkReactionsViewer ref="reactionsViewer" :note="appearNote"/>
<button class="button _button" @click="reply()"> <button class="_button" :class="$style.noteFooterButton" @click="reply()">
<i class="ti ti-arrow-back-up"></i> <i class="ti ti-arrow-back-up"></i>
<p v-if="appearNote.repliesCount > 0" class="count">{{ appearNote.repliesCount }}</p> <p v-if="appearNote.repliesCount > 0" :class="$style.noteFooterButtonCount">{{ appearNote.repliesCount }}</p>
</button> </button>
<button <button
v-if="canRenote" v-if="canRenote"
ref="renoteButton" ref="renoteButton"
class="button _button" class="_button"
:class="$style.noteFooterButton"
@mousedown="renote()" @mousedown="renote()"
> >
<i class="ti ti-repeat"></i> <i class="ti ti-repeat"></i>
<p v-if="appearNote.renoteCount > 0" class="count">{{ appearNote.renoteCount }}</p> <p v-if="appearNote.renoteCount > 0" :class="$style.noteFooterButtonCount">{{ appearNote.renoteCount }}</p>
</button> </button>
<button v-else class="button _button" disabled> <button v-else class="_button" :class="$style.noteFooterButton" disabled>
<i class="ti ti-ban"></i> <i class="ti ti-ban"></i>
</button> </button>
<button v-if="appearNote.myReaction == null" ref="reactButton" class="button _button" @mousedown="react()"> <button v-if="appearNote.myReaction == null" ref="reactButton" :class="$style.noteFooterButton" class="_button" @mousedown="react()">
<i v-if="appearNote.reactionAcceptance === 'likeOnly'" class="ti ti-heart"></i> <i v-if="appearNote.reactionAcceptance === 'likeOnly'" class="ti ti-heart"></i>
<i v-else class="ti ti-plus"></i> <i v-else class="ti ti-plus"></i>
</button> </button>
<button v-if="appearNote.myReaction != null" ref="reactButton" class="button _button reacted" @click="undoReact(appearNote)"> <button v-if="appearNote.myReaction != null" ref="reactButton" class="_button" :class="[$style.noteFooterButton, $style.reacted]" @click="undoReact(appearNote)">
<i class="ti ti-minus"></i> <i class="ti ti-minus"></i>
</button> </button>
<button v-if="defaultStore.state.showClipButtonInNoteFooter" ref="clipButton" class="button _button" @mousedown="clip()"> <button v-if="defaultStore.state.showClipButtonInNoteFooter" ref="clipButton" class="_button" :class="$style.noteFooterButton" @mousedown="clip()">
<i class="ti ti-paperclip"></i> <i class="ti ti-paperclip"></i>
</button> </button>
<button ref="menuButton" class="button _button" @mousedown="menu()"> <button ref="menuButton" class="_button" :class="$style.noteFooterButton" @mousedown="menu()">
<i class="ti ti-dots"></i> <i class="ti ti-dots"></i>
</button> </button>
</footer> </footer>
</div>
</article> </article>
<MkNoteSub v-for="note in replies" :key="note.id" :note="note" class="reply" :detail="true"/> <MkNoteSub v-for="note in replies" :key="note.id" :note="note" :class="$style.reply" :detail="true"/>
</div> </div>
<div v-else class="_panel muted" @click="muted = false"> <div v-else class="_panel" :class="$style.muted" @click="muted = false">
<I18n :src="i18n.ts.userSaysSomething" tag="small"> <I18n :src="i18n.ts.userSaysSomething" tag="small">
<template #name> <template #name>
<MkA v-user-preview="appearNote.userId" class="name" :to="userPage(appearNote.user)"> <MkA v-user-preview="appearNote.userId" :to="userPage(appearNote.user)">
<MkUserName :user="appearNote.user"/> <MkUserName :user="appearNote.user"/>
</MkA> </MkA>
</template> </template>
@ -438,57 +435,33 @@ if (appearNote.replyId) {
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss" module>
.lxwezrsl { .root {
position: relative; position: relative;
transition: box-shadow 0.1s ease; transition: box-shadow 0.1s ease;
overflow: clip; overflow: clip;
contain: content; contain: content;
&:focus-visible {
outline: none;
&:after {
content: "";
pointer-events: none;
display: block;
position: absolute;
z-index: 10;
top: 0;
left: 0;
right: 0;
bottom: 0;
margin: auto;
width: calc(100% - 8px);
height: calc(100% - 8px);
border: dashed 1px var(--focus);
border-radius: var(--radius);
box-sizing: border-box;
}
} }
&:hover > .article > .main > .footer > .button { .replyTo {
opacity: 1;
}
> .reply-to {
opacity: 0.7; opacity: 0.7;
padding-bottom: 0; padding-bottom: 0;
} }
> .reply-to-more { .replyToMore {
opacity: 0.7; opacity: 0.7;
} }
> .renote { .renote {
display: flex; display: flex;
align-items: center; align-items: center;
padding: 16px 32px 8px 32px; padding: 16px 32px 8px 32px;
line-height: 28px; line-height: 28px;
white-space: pre; white-space: pre;
color: var(--renote); color: var(--renote);
}
> .avatar { .renoteAvatar {
flex-shrink: 0; flex-shrink: 0;
display: inline-block; display: inline-block;
width: 28px; width: 28px;
@ -497,72 +470,69 @@ if (appearNote.replyId) {
border-radius: 6px; border-radius: 6px;
} }
> i { .renoteText {
margin-right: 4px;
}
> span {
overflow: hidden; overflow: hidden;
flex-shrink: 1; flex-shrink: 1;
text-overflow: ellipsis; text-overflow: ellipsis;
white-space: nowrap; white-space: nowrap;
}
> .name { .renoteName {
font-weight: bold; font-weight: bold;
} }
}
> .info { .renoteInfo {
margin-left: auto; margin-left: auto;
font-size: 0.9em; font-size: 0.9em;
}
> .time { .renoteTime {
flex-shrink: 0; flex-shrink: 0;
color: inherit; color: inherit;
> .dropdownIcon {
margin-right: 4px;
}
}
}
} }
> .renote + .article { .renote + .note {
padding-top: 8px; padding-top: 8px;
} }
> .article { .note {
padding: 32px; padding: 32px;
font-size: 1.2em; font-size: 1.2em;
> .header { &:hover > .main > .footer > .button {
opacity: 1;
}
}
.noteHeader {
display: flex; display: flex;
position: relative; position: relative;
margin-bottom: 16px; margin-bottom: 16px;
align-items: center; align-items: center;
}
> .avatar { .noteHeaderAvatar {
display: block; display: block;
flex-shrink: 0; flex-shrink: 0;
width: 58px; width: 58px;
height: 58px; height: 58px;
} }
> .body { .noteHeaderBody {
flex: 1; flex: 1;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
justify-content: center; justify-content: center;
padding-left: 16px; padding-left: 16px;
font-size: 0.95em; font-size: 0.95em;
}
> .top { .noteHeaderName {
> .name {
font-weight: bold; font-weight: bold;
line-height: 1.3; line-height: 1.3;
} }
> .is-bot { .isBot {
display: inline-block; display: inline-block;
margin: 0 0.5em; margin: 0 0.5em;
padding: 4px 6px; padding: 4px 6px;
@ -572,91 +542,73 @@ if (appearNote.replyId) {
border-radius: 4px; border-radius: 4px;
} }
> .info { .noteHeaderInfo {
float: right; float: right;
} }
}
> .username { .noteHeaderUsername {
margin-bottom: 2px; margin-bottom: 2px;
line-height: 1.3; line-height: 1.3;
word-wrap: anywhere; word-wrap: anywhere;
} }
}
}
> .main { .noteContent {
> .body {
container-type: inline-size; container-type: inline-size;
overflow-wrap: break-word;
}
> .cw { .cw {
cursor: default; cursor: default;
display: block; display: block;
margin: 0; margin: 0;
padding: 0; padding: 0;
overflow-wrap: break-word; overflow-wrap: break-word;
> .text {
margin-right: 8px;
}
} }
> .content { .noteReplyTarget {
> .text {
overflow-wrap: break-word;
> .reply {
color: var(--accent); color: var(--accent);
margin-right: 0.5em; margin-right: 0.5em;
} }
> .rp { .rn {
margin-left: 4px; margin-left: 4px;
font-style: oblique; font-style: oblique;
color: var(--renote); color: var(--renote);
} }
> .translation { .translation {
border: solid 0.5px var(--divider); border: solid 0.5px var(--divider);
border-radius: var(--radius); border-radius: var(--radius);
padding: 12px; padding: 12px;
margin-top: 8px; margin-top: 8px;
} }
}
> .url-preview { .poll {
margin-top: 8px;
}
> .poll {
font-size: 80%; font-size: 80%;
} }
> .renote { .quote {
padding: 8px 0; padding: 8px 0;
}
> .note { .quoteNote {
padding: 16px; padding: 16px;
border: dashed 1px var(--renote); border: dashed 1px var(--renote);
border-radius: 8px; border-radius: 8px;
} }
}
}
> .channel { .channel {
opacity: 0.7; opacity: 0.7;
font-size: 80%; font-size: 80%;
} }
}
> .footer { .noteFooterInfo {
> .info {
margin: 16px 0; margin: 16px 0;
opacity: 0.7; opacity: 0.7;
font-size: 0.9em; font-size: 0.9em;
} }
> .button { .noteFooterButton {
margin: 0; margin: 0;
padding: 8px; padding: 8px;
opacity: 0.7; opacity: 0.7;
@ -668,91 +620,67 @@ if (appearNote.replyId) {
&:hover { &:hover {
color: var(--fgHighlighted); color: var(--fgHighlighted);
} }
}
> .count { .noteFooterButtonCount {
display: inline; display: inline;
margin: 0 0 0 8px; margin: 0 0 0 8px;
opacity: 0.7; opacity: 0.7;
}
&.reacted { &.reacted {
color: var(--accent); color: var(--accent);
} }
} }
}
}
}
> .reply { .reply {
border-top: solid 0.5px var(--divider); border-top: solid 0.5px var(--divider);
} }
}
@container (max-width: 500px) { @container (max-width: 500px) {
.lxwezrsl { .root {
font-size: 0.9em; font-size: 0.9em;
} }
} }
@container (max-width: 450px) { @container (max-width: 450px) {
.lxwezrsl { .renote {
> .renote {
padding: 8px 16px 0 16px; padding: 8px 16px 0 16px;
} }
> .article { .note {
padding: 16px; padding: 16px;
}
> .header { .noteHeaderAvatar {
> .avatar {
width: 50px; width: 50px;
height: 50px; height: 50px;
} }
} }
}
}
}
@container (max-width: 350px) { @container (max-width: 350px) {
.lxwezrsl { .noteFooterButton {
> .article {
> .main {
> .footer {
> .button {
&:not(:last-child) { &:not(:last-child) {
margin-right: 18px; margin-right: 18px;
} }
} }
} }
}
}
}
}
@container (max-width: 300px) { @container (max-width: 300px) {
.lxwezrsl { .root {
font-size: 0.825em; font-size: 0.825em;
}
> .article { .noteHeaderAvatar {
> .header {
> .avatar {
width: 50px; width: 50px;
height: 50px; height: 50px;
} }
}
> .main { .noteFooterButton {
> .footer {
> .button {
&:not(:last-child) { &:not(:last-child) {
margin-right: 12px; margin-right: 12px;
} }
} }
} }
}
}
}
}
.muted { .muted {
padding: 8px; padding: 8px;