Skip to content

fix(client): nav control focus (Triggered with next page/animation at the same time) #40

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
May 9, 2021
Merged

fix(client): nav control focus (Triggered with next page/animation at the same time) #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0852013
fix: Prevent navigator buttons from being triggered by spacebar
FyisFe May 9, 2021
b848063
fix: total page number is 1 less than the actual one
FyisFe May 9, 2021
8ff5fae
Merge branch 'slidevjs:main' into main
FyisFe May 9, 2021
0802414
fix: nav control focus (Triggered with next page at the same time)
FyisFe May 9, 2021
3ba5289
fix: remove @key.prevent and format navControls
FyisFe May 9, 2021
3c8b50f
fix: convert menuButton from div to button
FyisFe May 9, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions packages/client/internals/MenuButton.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ onClickOutside(el, () => {

<template>
<div ref="el" class="flex relative">
<div :class="{ disabled }" @click="value = !value">
<button :class="{ disabled }" @click="value = !value">
<slot name="button" :class="{ disabled }" />
</div>
</button>
<div
v-show="value"
class="rounded-md bg-main shadow absolute bottom-10 left-0 z-20"
Expand Down
2 changes: 1 addition & 1 deletion packages/client/state/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ export const isScreenVertical = computed(() => windowSize.width.value <= windowS
export const fullscreen = useFullscreen(isClient ? document.body : null)

export const activeElement = useActiveElement()
export const isInputing = computed(() => ['INPUT', 'TEXTAREA'].includes(activeElement.value?.tagName || '') || activeElement.value?.classList.contains('CodeMirror-code'))
export const isInputing = computed(() => ['INPUT', 'TEXTAREA', 'BUTTON', 'A'].includes(activeElement.value?.tagName || '') || activeElement.value?.classList.contains('CodeMirror-code'))

export const currentCamera = useStorage<string>('slidev-camera', 'default')
export const currentMic = useStorage<string>('slidev-mic', 'default')
Expand Down