mirror of
https://github.com/paricafe/misskey.git
synced 2025-01-20 06:18:41 -06:00
385969e9f5
* fix(frontend): 直前のパターンを記録するように * fix(frontend): フォーカス/タブ移動に関する挙動を調整 (#226) Cherry-pick commit e8c030673326871edf3623cf2b8675d68f9e1b13 Co-authored-by: taiyme <53635909+taiyme@users.noreply.github.com> * focusのデザイン修正 * move scripts * Modalにfocus trapを追加 * 記録するホットキーはレートリミット式にする * escキーのハンドリングをMkModalに統一 * fix * enterで子メニューを開けるように * lint * fix focus trap * improve switch accessibility * 一部のmodalのフォーカストラップが外れない問題を修正 * fix * fix * Revert "記録するホットキーはレートリミット式にする" This reverts commit 40a7509286a87911ad4cc06d9482e8a2e5d0e7e8. * Revert "fix(frontend): 直前のパターンを記録するように" This reverts commit 5372b2594023952cff34aa62253ed4efef15b5dd. * Revert "Revert "fix(frontend): 直前のパターンを記録するように"" This reverts commit a9bb52e799e110927ad92cd8f26af980819334e1. * Revert "Revert "記録するホットキーはレートリミット式にする"" This reverts commit bdac34273e0bc5f13604c7e2f9fa6b1321a0df3d. * 試験的にCypressでのFocustrapを無効化 * fix * fix focus-trap * Update Changelog * ✌️ * fix focustrap invocation logic * スクロールがsticky headerを考慮するように * 🎨 * スタイルの微調整 * 🎨 * remove deprecated key aliases * focusElementが足りなかったので修正 * preview系にfocus時スタイルが足りなかったので修正 * `returnFocusElement` -> `returnFocusTo` * lint * Update packages/frontend/src/components/MkModalWindow.vue * Apply suggestions from code review Co-authored-by: taiy <53635909+taiyme@users.noreply.github.com> * keydownイベントをまとめる * use correct pesudo-element selector * fix * rename --------- Co-authored-by: taiyme <53635909+taiyme@users.noreply.github.com> Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com>
99 lines
2 KiB
Vue
99 lines
2 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="user"/>
|
|
<div :class="$style.main">
|
|
<div :class="$style.header">
|
|
<MkUserName :user="user" :nowrap="true"/>
|
|
</div>
|
|
<div>
|
|
<p v-if="useCw" :class="$style.cw">
|
|
<Mfm v-if="cw != null && 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>
|
|
</div>
|
|
</div>
|
|
</template>
|
|
|
|
<script lang="ts" setup>
|
|
import { ref } from 'vue';
|
|
import * as Misskey from 'misskey-js';
|
|
import type { PollEditorModelValue } from '@/components/MkPollEditor.vue';
|
|
import MkCwButton from '@/components/MkCwButton.vue';
|
|
|
|
const showContent = ref(false);
|
|
|
|
const props = defineProps<{
|
|
text: string;
|
|
files: Misskey.entities.DriveFile[];
|
|
poll?: PollEditorModelValue;
|
|
useCw: boolean;
|
|
cw: string | null;
|
|
user: Misskey.entities.User;
|
|
}>();
|
|
</script>
|
|
|
|
<style lang="scss" module>
|
|
.root {
|
|
display: flex;
|
|
margin: 0;
|
|
padding: 0;
|
|
overflow: clip;
|
|
font-size: 0.95em;
|
|
}
|
|
|
|
.avatar {
|
|
flex-shrink: 0 !important;
|
|
display: block !important;
|
|
margin: 0 10px 0 0 !important;
|
|
width: 40px !important;
|
|
height: 40px !important;
|
|
border-radius: 8px !important;
|
|
pointer-events: none !important;
|
|
}
|
|
|
|
.main {
|
|
flex: 1;
|
|
min-width: 0;
|
|
}
|
|
|
|
.cw {
|
|
cursor: default;
|
|
display: block;
|
|
margin: 0;
|
|
padding: 0;
|
|
overflow-wrap: break-word;
|
|
}
|
|
|
|
.header {
|
|
margin-bottom: 2px;
|
|
font-weight: bold;
|
|
width: 100%;
|
|
overflow: clip;
|
|
text-overflow: ellipsis;
|
|
}
|
|
|
|
@container (min-width: 350px) {
|
|
.avatar {
|
|
margin: 0 10px 0 0 !important;
|
|
width: 44px !important;
|
|
height: 44px !important;
|
|
}
|
|
}
|
|
|
|
@container (min-width: 500px) {
|
|
.avatar {
|
|
margin: 0 12px 0 0 !important;
|
|
width: 48px !important;
|
|
height: 48px !important;
|
|
}
|
|
}
|
|
</style>
|