fix(menu-option): fix keyboard trigger conflict

varletjs · Dec 29, 2024 · a95811f · a95811f
1 parent f68f840
commit a95811f
Showing 1 changed file with 13 additions and 8 deletions.
diff --git a/packages/varlet-ui/src/menu-option/MenuOption.vue b/packages/varlet-ui/src/menu-option/MenuOption.vue
@@ -143,21 +143,25 @@ export default defineComponent({
         return
       }
 
-      if (event.key === ' ' || event.key === 'Enter') {
-        preventDefault(event)
-      }
-
-      if (event.key === 'Enter') {
-        root.value!.click()
-      }
-
       if (event.key === 'ArrowRight') {
         call(props.onKeyArrowX, event.key)
       }
 
       if (event.key === 'ArrowLeft') {
         call(props.onKeyArrowX, event.key)
       }
+
+      if (!isFocusing.value) {
+        return
+      }
+
+      if (event.key === ' ' || event.key === 'Enter') {
+        preventDefault(event)
+      }
+
+      if (event.key === 'Enter') {
+        root.value!.click()
+      }
     }
 
     function handleKeyup(event: KeyboardEvent) {
@@ -173,6 +177,7 @@ export default defineComponent({
 
     async function handleSelect() {
       await nextTick()
+      console.log(menuOptionProvider)
       onSelect(menuOptionProvider)
     }