43c0ffe7f8
We use MfM in all sorts of places, and only some of them are actual blocks. We can now tell the `Mfm` component to make the top-level `<bdi>` a block when we need to (mostly note bodies, user descriptions, announcements) and leave it inline in all other places. This should still rendener inline rtl content embedded in ltr text in a sensible way, while providing right-alignment for fully rtl blocks.
113 lines
2.3 KiB
Vue
113 lines
2.3 KiB
Vue
<!--
|
|
SPDX-FileCopyrightText: syuilo and misskey-project
|
|
SPDX-License-Identifier: AGPL-3.0-only
|
|
-->
|
|
|
|
<template>
|
|
<div :class="$style.root">
|
|
<MkAvatar :class="$style.avatar" :user="note.user" link preview/>
|
|
<div :class="$style.main">
|
|
<MkNoteHeader :class="$style.header" :note="note" :mini="true"/>
|
|
<div>
|
|
<p v-if="note.cw != null" :class="$style.cw">
|
|
<Mfm v-if="note.cw != ''" style="margin-right: 8px;" :text="note.cw" :isBlock="true" :author="note.user" :nyaize="'respect'" :emojiUrls="note.emojis"/>
|
|
<MkCwButton v-model="showContent" :text="note.text" :files="note.files" :poll="note.poll" @click.stop/>
|
|
</p>
|
|
<div v-show="note.cw == null || showContent">
|
|
<MkSubNoteContent :hideFiles="hideFiles" :class="$style.text" :note="note" :expandAllCws="props.expandAllCws"/>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</template>
|
|
|
|
<script lang="ts" setup>
|
|
import { ref, watch } from 'vue';
|
|
import * as Misskey from 'misskey-js';
|
|
import MkNoteHeader from '@/components/MkNoteHeader.vue';
|
|
import MkSubNoteContent from '@/components/MkSubNoteContent.vue';
|
|
import MkCwButton from '@/components/MkCwButton.vue';
|
|
import { defaultStore } from '@/store.js';
|
|
|
|
const props = defineProps<{
|
|
note: Misskey.entities.Note;
|
|
expandAllCws?: boolean;
|
|
hideFiles?: boolean;
|
|
}>();
|
|
|
|
let showContent = ref(defaultStore.state.uncollapseCW);
|
|
|
|
watch(() => props.expandAllCws, (expandAllCws) => {
|
|
if (expandAllCws !== showContent.value) showContent.value = expandAllCws;
|
|
});
|
|
</script>
|
|
|
|
<style lang="scss" module>
|
|
.root {
|
|
display: flex;
|
|
margin: 0;
|
|
padding: 0;
|
|
font-size: 0.95em;
|
|
}
|
|
|
|
.avatar {
|
|
flex-shrink: 0;
|
|
display: block;
|
|
margin: 0 10px 0 0;
|
|
width: 34px;
|
|
height: 34px;
|
|
border-radius: var(--radius-sm);
|
|
position: sticky !important;
|
|
top: calc(16px + var(--stickyTop, 0px));
|
|
left: 0;
|
|
}
|
|
|
|
.main {
|
|
flex: 1;
|
|
min-width: 0;
|
|
}
|
|
|
|
.header {
|
|
margin-bottom: 2px;
|
|
z-index: 2;
|
|
}
|
|
|
|
.cw {
|
|
display: block;
|
|
margin: 0;
|
|
padding: 0;
|
|
overflow-wrap: break-word;
|
|
overflow: hidden;
|
|
}
|
|
|
|
.text {
|
|
cursor: default;
|
|
margin: 0;
|
|
padding: 0;
|
|
overflow: hidden;
|
|
}
|
|
|
|
@container (min-width: 250px) {
|
|
.avatar {
|
|
margin: 0 10px 0 0;
|
|
width: 40px;
|
|
height: 40px;
|
|
}
|
|
}
|
|
|
|
@container (min-width: 350px) {
|
|
.avatar {
|
|
margin: 0 10px 0 0;
|
|
width: 44px;
|
|
height: 44px;
|
|
}
|
|
}
|
|
|
|
@container (min-width: 500px) {
|
|
.avatar {
|
|
margin: 0 12px 0 0;
|
|
width: 48px;
|
|
height: 48px;
|
|
}
|
|
}
|
|
</style>
|