diff options
| author | かっこかり <67428053+kakkokari-gtyih@users.noreply.github.com> | 2024-07-13 13:02:27 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-07-13 13:02:27 +0900 |
| commit | 1b175ea759ffdb0e70b66f1958ef114ecd00a50f (patch) | |
| tree | 78359067185f4b4d13939218a760705562f67b39 /packages/frontend/src/components | |
| parent | fix(backend): デフォルトテーマに無効なテーマコードを入力... (diff) | |
| download | sharkey-1b175ea759ffdb0e70b66f1958ef114ecd00a50f.tar.gz sharkey-1b175ea759ffdb0e70b66f1958ef114ecd00a50f.tar.bz2 sharkey-1b175ea759ffdb0e70b66f1958ef114ecd00a50f.zip | |
fix(frontend): すでにfocus trap対象の要素にinertがかかっている場合は解除するように (#14189)
* fix(frontend): すでにfocus trap対象の要素にinertがかかっている場合は解除するように
* 他のfocus-trapped要素とのインタラクションがある場合の動作を変更
* typo
Diffstat (limited to 'packages/frontend/src/components')
| -rw-r--r-- | packages/frontend/src/components/MkEmojiPickerDialog.vue | 1 | ||||
| -rw-r--r-- | packages/frontend/src/components/MkModal.vue | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/packages/frontend/src/components/MkEmojiPickerDialog.vue b/packages/frontend/src/components/MkEmojiPickerDialog.vue index a413b146ba..7e1ffbfa9e 100644 --- a/packages/frontend/src/components/MkEmojiPickerDialog.vue +++ b/packages/frontend/src/components/MkEmojiPickerDialog.vue @@ -9,6 +9,7 @@ SPDX-License-Identifier: AGPL-3.0-only v-slot="{ type, maxHeight }" :zPriority="'middle'" :preferType="defaultStore.state.emojiPickerUseDrawerForMobile === false ? 'popup' : 'auto'" + :hasInteractionWithOtherFocusTrappedEls="true" :transparentBg="true" :manualShowing="manualShowing" :src="src" diff --git a/packages/frontend/src/components/MkModal.vue b/packages/frontend/src/components/MkModal.vue index a5fbf8d365..f8032f9b43 100644 --- a/packages/frontend/src/components/MkModal.vue +++ b/packages/frontend/src/components/MkModal.vue @@ -71,6 +71,7 @@ const props = withDefaults(defineProps<{ zPriority?: 'low' | 'middle' | 'high'; noOverlap?: boolean; transparentBg?: boolean; + hasInteractionWithOtherFocusTrappedEls?: boolean; returnFocusTo?: HTMLElement | null; }>(), { manualShowing: null, @@ -80,6 +81,7 @@ const props = withDefaults(defineProps<{ zPriority: 'low', noOverlap: true, transparentBg: false, + hasInteractionWithOtherFocusTrappedEls: false, returnFocusTo: null, }); @@ -326,7 +328,7 @@ onMounted(() => { watch([showing, () => props.manualShowing], ([showing, manualShowing]) => { if (manualShowing === true || (manualShowing == null && showing === true)) { if (modalRootEl.value != null) { - const { release } = focusTrap(modalRootEl.value); + const { release } = focusTrap(modalRootEl.value, props.hasInteractionWithOtherFocusTrappedEls); releaseFocusTrap = release; modalRootEl.value.focus(); |