mirror of
https://activitypub.software/TransFem-org/Sharkey.git
synced 2024-12-17 02:49:01 +01: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>
93 lines
2.1 KiB
Vue
93 lines
2.1 KiB
Vue
<!--
|
|
SPDX-FileCopyrightText: syuilo and misskey-project
|
|
SPDX-License-Identifier: AGPL-3.0-only
|
|
-->
|
|
|
|
<template>
|
|
<div ref="el" :class="$style.root">
|
|
<MkMenu :items="items" :align="align" :width="width" :asDrawer="false" @close="onChildClosed"/>
|
|
</div>
|
|
</template>
|
|
|
|
<script lang="ts" setup>
|
|
import { nextTick, onMounted, onUnmounted, provide, shallowRef, watch } from 'vue';
|
|
import MkMenu from './MkMenu.vue';
|
|
import { MenuItem } from '@/types/menu.js';
|
|
|
|
const props = defineProps<{
|
|
items: MenuItem[];
|
|
targetElement: HTMLElement;
|
|
rootElement: HTMLElement;
|
|
width?: number;
|
|
}>();
|
|
|
|
const emit = defineEmits<{
|
|
(ev: 'closed'): void;
|
|
(ev: 'actioned'): void;
|
|
}>();
|
|
|
|
provide('isNestingMenu', true);
|
|
|
|
const el = shallowRef<HTMLElement>();
|
|
const align = 'left';
|
|
|
|
const SCROLLBAR_THICKNESS = 16;
|
|
|
|
function setPosition() {
|
|
if (el.value == null) return;
|
|
const rootRect = props.rootElement.getBoundingClientRect();
|
|
const parentRect = props.targetElement.getBoundingClientRect();
|
|
const myRect = el.value.getBoundingClientRect();
|
|
|
|
let left = props.targetElement.offsetWidth;
|
|
let top = (parentRect.top - rootRect.top) - 8;
|
|
if (rootRect.left + left + myRect.width >= (window.innerWidth - SCROLLBAR_THICKNESS)) {
|
|
left = -myRect.width;
|
|
}
|
|
if (rootRect.top + top + myRect.height >= (window.innerHeight - SCROLLBAR_THICKNESS)) {
|
|
top = top - ((rootRect.top + top + myRect.height) - (window.innerHeight - SCROLLBAR_THICKNESS));
|
|
}
|
|
el.value.style.left = left + 'px';
|
|
el.value.style.top = top + 'px';
|
|
}
|
|
|
|
function onChildClosed(actioned?: boolean) {
|
|
if (actioned) {
|
|
emit('actioned');
|
|
} else {
|
|
emit('closed');
|
|
}
|
|
}
|
|
|
|
watch(() => props.targetElement, () => {
|
|
setPosition();
|
|
});
|
|
|
|
const ro = new ResizeObserver((entries, observer) => {
|
|
setPosition();
|
|
});
|
|
|
|
onMounted(() => {
|
|
if (el.value) ro.observe(el.value);
|
|
setPosition();
|
|
nextTick(() => {
|
|
setPosition();
|
|
});
|
|
});
|
|
|
|
onUnmounted(() => {
|
|
ro.disconnect();
|
|
});
|
|
|
|
defineExpose({
|
|
checkHit: (ev: MouseEvent) => {
|
|
return (ev.target === el.value || el.value?.contains(ev.target as Node));
|
|
},
|
|
});
|
|
</script>
|
|
|
|
<style lang="scss" module>
|
|
.root {
|
|
position: absolute;
|
|
}
|
|
</style>
|