consistency + fix

This commit is contained in:
Freeplay 2023-04-28 21:18:00 -04:00
parent 81121533b0
commit 253ba164e5
3 changed files with 7 additions and 6 deletions

View File

@ -18,7 +18,7 @@
@enter="emit('opening')" @enter="emit('opening')"
@after-enter="onOpened" @after-enter="onOpened"
> >
<focus-trap v-model:active="isActive"> <FocusTrap v-model:active="isActive">
<div <div
v-show="manualShowing != null ? manualShowing : showing" v-show="manualShowing != null ? manualShowing : showing"
v-hotkey.global="keymap" v-hotkey.global="keymap"
@ -66,7 +66,7 @@
<slot :max-height="maxHeight" :type="type"></slot> <slot :max-height="maxHeight" :type="type"></slot>
</div> </div>
</div> </div>
</focus-trap> </FocusTrap>
</Transition> </Transition>
</template> </template>
@ -187,8 +187,8 @@ function close(opts: { useSendAnimation?: boolean } = {}) {
function onBgClick() { function onBgClick() {
if (contentClicking) return; if (contentClicking) return;
emit("click");
focusedElement.focus(); focusedElement.focus();
emit("click");
} }
if (type === "drawer") { if (type === "drawer") {

View File

@ -6,7 +6,7 @@
@keyup.esc="$emit('close')" @keyup.esc="$emit('close')"
@closed="$emit('closed')" @closed="$emit('closed')"
> >
<focus-trap v-model:active="isActive"> <FocusTrap v-model:active="isActive">
<div <div
ref="rootEl" ref="rootEl"
class="ebkgoccj" class="ebkgoccj"
@ -21,6 +21,7 @@
: '100%', : '100%',
}" }"
@keydown="onKeydown" @keydown="onKeydown"
tabindex="-1"
> >
<div ref="headerEl" class="header"> <div ref="headerEl" class="header">
<button <button
@ -53,7 +54,7 @@
<slot :width="bodyWidth" :height="bodyHeight"></slot> <slot :width="bodyWidth" :height="bodyHeight"></slot>
</div> </div>
</div> </div>
</focus-trap> </FocusTrap>
</MkModal> </MkModal>
</template> </template>

View File

@ -101,7 +101,7 @@
</div> </div>
</template> </template>
<div <div
v-if="!showContent" v-if="note.cw && !showContent"
tabindex="0" tabindex="0"
v-on:focus="cwButton?.focus()" v-on:focus="cwButton?.focus()"
></div> ></div>