fix(editor): fist screen empty, close #58

slidevjs · May 11, 2021 · d2f2445 · d2f2445
1 parent ee323e7
commit d2f2445
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/packages/client/logic/shortcuts.ts b/packages/client/logic/shortcuts.ts
@@ -1,9 +1,9 @@
 import { Fn, not, and, whenever } from '@vueuse/core'
-import { fullscreen, magicKeys, shortcutsEnabled, isInputing, toggleOverview, showGotoDialog, showOverview } from '../state'
+import { fullscreen, magicKeys, shortcutsEnabled, isInputing, toggleOverview, showGotoDialog, showOverview, isOnFocus } from '../state'
 import { toggleDark } from './dark'
 import { next, nextSlide, prev, prevSlide } from './nav'
 
-const _shortcut = and(not(isInputing), shortcutsEnabled)
+const _shortcut = and(not(isInputing), not(isOnFocus), shortcutsEnabled)
 
 export function shortcut(key: string, fn: Fn) {
   return whenever(and(magicKeys[key], _shortcut), fn, { flush: 'sync' })

diff --git a/packages/client/state/index.ts b/packages/client/state/index.ts
@@ -15,7 +15,8 @@ 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', 'BUTTON', 'A'].includes(activeElement.value?.tagName || '') || activeElement.value?.classList.contains('CodeMirror-code'))
+export const isInputing = computed(() => ['INPUT', 'TEXTAREA'].includes(activeElement.value?.tagName || '') || activeElement.value?.classList.contains('CodeMirror-code'))
+export const isOnFocus = computed(() => ['BUTTON', 'A'].includes(activeElement.value?.tagName || ''))
 
 export const currentCamera = useStorage<string>('slidev-camera', 'default')
 export const currentMic = useStorage<string>('slidev-mic', 'default')