consistency + fix
This commit is contained in:
parent
81121533b0
commit
253ba164e5
3 changed files with 7 additions and 6 deletions
|
@ -18,7 +18,7 @@
|
|||
@enter="emit('opening')"
|
||||
@after-enter="onOpened"
|
||||
>
|
||||
<focus-trap v-model:active="isActive">
|
||||
<FocusTrap v-model:active="isActive">
|
||||
<div
|
||||
v-show="manualShowing != null ? manualShowing : showing"
|
||||
v-hotkey.global="keymap"
|
||||
|
@ -66,7 +66,7 @@
|
|||
<slot :max-height="maxHeight" :type="type"></slot>
|
||||
</div>
|
||||
</div>
|
||||
</focus-trap>
|
||||
</FocusTrap>
|
||||
</Transition>
|
||||
</template>
|
||||
|
||||
|
@ -187,8 +187,8 @@ function close(opts: { useSendAnimation?: boolean } = {}) {
|
|||
|
||||
function onBgClick() {
|
||||
if (contentClicking) return;
|
||||
emit("click");
|
||||
focusedElement.focus();
|
||||
emit("click");
|
||||
}
|
||||
|
||||
if (type === "drawer") {
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
@keyup.esc="$emit('close')"
|
||||
@closed="$emit('closed')"
|
||||
>
|
||||
<focus-trap v-model:active="isActive">
|
||||
<FocusTrap v-model:active="isActive">
|
||||
<div
|
||||
ref="rootEl"
|
||||
class="ebkgoccj"
|
||||
|
@ -21,6 +21,7 @@
|
|||
: '100%',
|
||||
}"
|
||||
@keydown="onKeydown"
|
||||
tabindex="-1"
|
||||
>
|
||||
<div ref="headerEl" class="header">
|
||||
<button
|
||||
|
@ -53,7 +54,7 @@
|
|||
<slot :width="bodyWidth" :height="bodyHeight"></slot>
|
||||
</div>
|
||||
</div>
|
||||
</focus-trap>
|
||||
</FocusTrap>
|
||||
</MkModal>
|
||||
</template>
|
||||
|
||||
|
|
|
@ -101,7 +101,7 @@
|
|||
</div>
|
||||
</template>
|
||||
<div
|
||||
v-if="!showContent"
|
||||
v-if="note.cw && !showContent"
|
||||
tabindex="0"
|
||||
v-on:focus="cwButton?.focus()"
|
||||
></div>
|
||||
|
|
Loading…
Reference in a new issue