* 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>
105 lines
2.8 KiB
Vue
105 lines
2.8 KiB
Vue
<!--
|
|
SPDX-FileCopyrightText: syuilo and misskey-project
|
|
SPDX-License-Identifier: AGPL-3.0-only
|
|
-->
|
|
|
|
<template>
|
|
<div ref="rootEl">
|
|
<div ref="headerEl">
|
|
<slot name="header"></slot>
|
|
</div>
|
|
<div
|
|
ref="bodyEl"
|
|
:data-sticky-container-header-height="headerHeight"
|
|
:data-sticky-container-footer-height="footerHeight"
|
|
>
|
|
<slot></slot>
|
|
</div>
|
|
<div ref="footerEl">
|
|
<slot name="footer"></slot>
|
|
</div>
|
|
</div>
|
|
</template>
|
|
|
|
<script lang="ts" setup>
|
|
import { onMounted, onUnmounted, provide, inject, Ref, ref, watch, shallowRef } from 'vue';
|
|
|
|
import { CURRENT_STICKY_BOTTOM, CURRENT_STICKY_TOP } from '@/const.js';
|
|
|
|
const rootEl = shallowRef<HTMLElement>();
|
|
const headerEl = shallowRef<HTMLElement>();
|
|
const footerEl = shallowRef<HTMLElement>();
|
|
const bodyEl = shallowRef<HTMLElement>();
|
|
|
|
const headerHeight = ref<string | undefined>();
|
|
const childStickyTop = ref(0);
|
|
const parentStickyTop = inject<Ref<number>>(CURRENT_STICKY_TOP, ref(0));
|
|
provide(CURRENT_STICKY_TOP, childStickyTop);
|
|
|
|
const footerHeight = ref<string | undefined>();
|
|
const childStickyBottom = ref(0);
|
|
const parentStickyBottom = inject<Ref<number>>(CURRENT_STICKY_BOTTOM, ref(0));
|
|
provide(CURRENT_STICKY_BOTTOM, childStickyBottom);
|
|
|
|
const calc = () => {
|
|
// コンポーネントが表示されてないけどKeepAliveで残ってる場合などは null になる
|
|
if (headerEl.value != null) {
|
|
childStickyTop.value = parentStickyTop.value + headerEl.value.offsetHeight;
|
|
headerHeight.value = headerEl.value.offsetHeight.toString();
|
|
}
|
|
|
|
// コンポーネントが表示されてないけどKeepAliveで残ってる場合などは null になる
|
|
if (footerEl.value != null) {
|
|
childStickyBottom.value = parentStickyBottom.value + footerEl.value.offsetHeight;
|
|
footerHeight.value = footerEl.value.offsetHeight.toString();
|
|
}
|
|
};
|
|
|
|
const observer = new ResizeObserver(() => {
|
|
window.setTimeout(() => {
|
|
calc();
|
|
}, 100);
|
|
});
|
|
|
|
onMounted(() => {
|
|
calc();
|
|
|
|
watch([parentStickyTop, parentStickyBottom], calc);
|
|
|
|
watch(childStickyTop, () => {
|
|
if (bodyEl.value == null) return;
|
|
bodyEl.value.style.setProperty('--stickyTop', `${childStickyTop.value}px`);
|
|
}, {
|
|
immediate: true,
|
|
});
|
|
|
|
watch(childStickyBottom, () => {
|
|
if (bodyEl.value == null) return;
|
|
bodyEl.value.style.setProperty('--stickyBottom', `${childStickyBottom.value}px`);
|
|
}, {
|
|
immediate: true,
|
|
});
|
|
|
|
if (headerEl.value != null) {
|
|
headerEl.value.style.position = 'sticky';
|
|
headerEl.value.style.top = 'var(--stickyTop, 0)';
|
|
headerEl.value.style.zIndex = '1000';
|
|
observer.observe(headerEl.value);
|
|
}
|
|
|
|
if (footerEl.value != null) {
|
|
footerEl.value.style.position = 'sticky';
|
|
footerEl.value.style.bottom = 'var(--stickyBottom, 0)';
|
|
footerEl.value.style.zIndex = '1000';
|
|
observer.observe(footerEl.value);
|
|
}
|
|
});
|
|
|
|
onUnmounted(() => {
|
|
observer.disconnect();
|
|
});
|
|
|
|
defineExpose({
|
|
rootEl: rootEl,
|
|
});
|
|
</script>
|