diff options
| author | zyoshoka <107108195+zyoshoka@users.noreply.github.com> | 2023-11-30 13:49:31 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-30 13:49:31 +0900 |
| commit | 98e1af28b8b6a8b9a08c19b2abf926ae11e31dd9 (patch) | |
| tree | 9bb436dd386b06b0e99a868213254130e942d69c /packages/frontend/src/components/MkNotePreview.vue | |
| parent | Fix: navigator.share未サポートの場合は共有ボタンを非表示に... (diff) | |
| download | sharkey-98e1af28b8b6a8b9a08c19b2abf926ae11e31dd9.tar.gz sharkey-98e1af28b8b6a8b9a08c19b2abf926ae11e31dd9.tar.bz2 sharkey-98e1af28b8b6a8b9a08c19b2abf926ae11e31dd9.zip | |
enhance(frontend): ノートプレビューにCWが反映されるように (#12509)
* enhance(frontend): ノートプレビューにCWが反映されるように
* Update CHANGELOG.md
* refactor: 不要な条件を除去
* Revert "refactor: 不要な条件を除去"
This reverts commit e4eff689bd1f2df78411a2f01ee05434e2d298a8.
* fix: やっぱり不要な条件だった
Diffstat (limited to 'packages/frontend/src/components/MkNotePreview.vue')
| -rw-r--r-- | packages/frontend/src/components/MkNotePreview.vue | 28 |
1 files changed, 26 insertions, 2 deletions
diff --git a/packages/frontend/src/components/MkNotePreview.vue b/packages/frontend/src/components/MkNotePreview.vue index 9b7a39b537..d664d88231 100644 --- a/packages/frontend/src/components/MkNotePreview.vue +++ b/packages/frontend/src/components/MkNotePreview.vue @@ -11,7 +11,11 @@ SPDX-License-Identifier: AGPL-3.0-only <MkUserName :user="user" :nowrap="true"/> </div> <div> - <div> + <p v-if="useCw" :class="$style.cw"> + <Mfm v-if="cw != ''" :text="cw" :author="user" :nyaize="'respect'" :i="user" style="margin-right: 8px;"/> + <MkCwButton v-model="showContent" :text="text.trim()" :files="files" :poll="poll" style="margin: 4px 0;"/> + </p> + <div v-show="!useCw || showContent"> <Mfm :text="text.trim()" :author="user" :nyaize="'respect'" :i="user"/> </div> </div> @@ -20,11 +24,23 @@ SPDX-License-Identifier: AGPL-3.0-only </template> <script lang="ts" setup> -import { } from 'vue'; +import { ref } from 'vue'; import * as Misskey from 'misskey-js'; +import MkCwButton from '@/components/MkCwButton.vue'; + +const showContent = ref(false); const props = defineProps<{ text: string; + files: Misskey.entities.DriveFile[]; + poll?: { + choices: string[]; + multiple: boolean; + expiresAt: string | null; + expiredAfter: string | null; + }; + useCw: boolean; + cw: string | null; user: Misskey.entities.User; }>(); </script> @@ -53,6 +69,14 @@ const props = defineProps<{ min-width: 0; } +.cw { + cursor: default; + display: block; + margin: 0; + padding: 0; + overflow-wrap: break-word; +} + .header { margin-bottom: 2px; font-weight: bold; |