fix(drawer): unexpected event triggering

betavs · Jan 10, 2024 · 24ea75c · 24ea75c
1 parent 3f25f5c
commit 24ea75c
Showing 1 changed file with 2 additions and 5 deletions.
diff --git a/src/drawer/drawer.tsx b/src/drawer/drawer.tsx
@@ -100,7 +100,7 @@ export default defineComponent({
     });
 
     const handleEscKeydown = (e: KeyboardEvent) => {
-      if (props.closeOnEscKeydown ?? (globalConfig.value.closeOnEscKeydown && e.key === 'Escape')) {
+      if (props.closeOnEscKeydown ?? (globalConfig.value.closeOnEscKeydown && e.key === 'Escape' && isVisible.value)) {
         props.onEscKeydown?.({ e });
         closeDrawer({ trigger: 'esc', e });
       }
@@ -214,10 +214,7 @@ export default defineComponent({
     };
     const onKeyDown = (e: KeyboardEvent) => {
       // 根据closeOnEscKeydown判断按下ESC时是否触发close事件
-      if ((props.closeOnEscKeydown ?? globalConfig.value.closeOnEscKeydown) && e.key === 'Escape') {
-        props.onEscKeydown?.({ e });
-        closeDrawer({ trigger: 'esc', e });
-      }
+      handleEscKeydown(e);
     };
     const closeDrawer = (params: DrawerCloseContext) => {
       props.onClose?.(params);