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>
147 lines
3.4 KiB
Vue
147 lines
3.4 KiB
Vue
<!--
|
|
SPDX-FileCopyrightText: syuilo and misskey-project
|
|
SPDX-License-Identifier: AGPL-3.0-only
|
|
-->
|
|
|
|
<template>
|
|
<MkModal ref="modal" :preferType="'dialog'" @click="onBgClick" @closed="emit('closed')" @esc="emit('esc')">
|
|
<div ref="rootEl" :class="$style.root" :style="{ width: `${width}px`, height: `min(${height}px, 100%)` }">
|
|
<div ref="headerEl" :class="$style.header">
|
|
<button v-if="withOkButton" :class="$style.headerButton" class="_button" @click="$emit('close')"><i class="ti ti-x"></i></button>
|
|
<span :class="$style.title">
|
|
<slot name="header"></slot>
|
|
</span>
|
|
<button v-if="!withOkButton" :class="$style.headerButton" class="_button" data-cy-modal-window-close @click="$emit('close')"><i class="ti ti-x"></i></button>
|
|
<button v-if="withOkButton" :class="$style.headerButton" class="_button" :disabled="okButtonDisabled" @click="$emit('ok')"><i class="ti ti-check"></i></button>
|
|
</div>
|
|
<div :class="$style.body">
|
|
<slot :width="bodyWidth" :height="bodyHeight"></slot>
|
|
</div>
|
|
</div>
|
|
</MkModal>
|
|
</template>
|
|
|
|
<script lang="ts" setup>
|
|
import { onMounted, onUnmounted, shallowRef, ref } from 'vue';
|
|
import MkModal from './MkModal.vue';
|
|
|
|
const props = withDefaults(defineProps<{
|
|
withOkButton: boolean;
|
|
okButtonDisabled: boolean;
|
|
width: number;
|
|
height: number;
|
|
}>(), {
|
|
withOkButton: false,
|
|
okButtonDisabled: false,
|
|
width: 400,
|
|
height: 500,
|
|
});
|
|
|
|
const emit = defineEmits<{
|
|
(event: 'click'): void;
|
|
(event: 'close'): void;
|
|
(event: 'closed'): void;
|
|
(event: 'ok'): void;
|
|
(event: 'esc'): void;
|
|
}>();
|
|
|
|
const modal = shallowRef<InstanceType<typeof MkModal>>();
|
|
const rootEl = shallowRef<HTMLElement>();
|
|
const headerEl = shallowRef<HTMLElement>();
|
|
const bodyWidth = ref(0);
|
|
const bodyHeight = ref(0);
|
|
|
|
const close = () => {
|
|
modal.value?.close();
|
|
};
|
|
|
|
const onBgClick = () => {
|
|
emit('click');
|
|
};
|
|
|
|
const ro = new ResizeObserver((entries, observer) => {
|
|
if (rootEl.value == null || headerEl.value == null) return;
|
|
bodyWidth.value = rootEl.value.offsetWidth;
|
|
bodyHeight.value = rootEl.value.offsetHeight - headerEl.value.offsetHeight;
|
|
});
|
|
|
|
onMounted(() => {
|
|
if (rootEl.value == null || headerEl.value == null) return;
|
|
bodyWidth.value = rootEl.value.offsetWidth;
|
|
bodyHeight.value = rootEl.value.offsetHeight - headerEl.value.offsetHeight;
|
|
ro.observe(rootEl.value);
|
|
});
|
|
|
|
onUnmounted(() => {
|
|
ro.disconnect();
|
|
});
|
|
|
|
defineExpose({
|
|
close,
|
|
});
|
|
</script>
|
|
|
|
<style lang="scss" module>
|
|
.root {
|
|
margin: auto;
|
|
overflow: hidden;
|
|
display: flex;
|
|
flex-direction: column;
|
|
contain: content;
|
|
border-radius: var(--radius);
|
|
|
|
--root-margin: 24px;
|
|
|
|
@media (max-width: 500px) {
|
|
--root-margin: 16px;
|
|
}
|
|
|
|
--headerHeight: 46px;
|
|
--headerHeightNarrow: 42px;
|
|
}
|
|
|
|
.header {
|
|
display: flex;
|
|
flex-shrink: 0;
|
|
background: var(--windowHeader);
|
|
-webkit-backdrop-filter: var(--blur, blur(15px));
|
|
backdrop-filter: var(--blur, blur(15px));
|
|
}
|
|
|
|
.headerButton {
|
|
height: var(--headerHeight);
|
|
width: var(--headerHeight);
|
|
|
|
@media (max-width: 500px) {
|
|
height: var(--headerHeightNarrow);
|
|
width: var(--headerHeightNarrow);
|
|
}
|
|
}
|
|
|
|
.title {
|
|
flex: 1;
|
|
line-height: var(--headerHeight);
|
|
padding-left: 32px;
|
|
font-weight: bold;
|
|
white-space: nowrap;
|
|
overflow: hidden;
|
|
text-overflow: ellipsis;
|
|
pointer-events: none;
|
|
|
|
@media (max-width: 500px) {
|
|
line-height: var(--headerHeightNarrow);
|
|
padding-left: 16px;
|
|
}
|
|
}
|
|
|
|
.headerButton + .title {
|
|
padding-left: 0;
|
|
}
|
|
|
|
.body {
|
|
flex: 1;
|
|
overflow: auto;
|
|
background: var(--panel);
|
|
container-type: size;
|
|
}
|
|
</style>
|