Browse Source

fix: when modal and drawer exist at the same time, click Close All (#4521)

pull/4523/head
Vben 2 years ago
committed by GitHub
parent
commit
26646d42f7
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
  1. 4
      packages/@core/ui-kit/popup-ui/src/drawer/drawer.vue
  2. 2
      packages/@core/ui-kit/shadcn-ui/src/components/ui/sheet/SheetOverlay.vue

4
packages/@core/ui-kit/popup-ui/src/drawer/drawer.vue

@ -83,8 +83,8 @@ function escapeKeyDown(e: KeyboardEvent) {
// pointer-down-outside // pointer-down-outside
function pointerDownOutside(e: Event) { function pointerDownOutside(e: Event) {
const target = e.target as HTMLElement; const target = e.target as HTMLElement;
const isDismissableModal = !!target?.dataset.dismissableModal; const dismissableDrawer = !!target?.dataset.dismissableDrawer;
if (!closeOnClickModal.value || !isDismissableModal) { if (!closeOnClickModal.value || !dismissableDrawer) {
e.preventDefault(); e.preventDefault();
} }
} }

2
packages/@core/ui-kit/shadcn-ui/src/components/ui/sheet/SheetOverlay.vue

@ -6,6 +6,6 @@ useScrollLock();
<template> <template>
<div <div
class="bg-overlay fixed inset-0 z-[1000]" class="bg-overlay fixed inset-0 z-[1000]"
data-dismissable-modal="true" data-dismissable-drawer="true"
></div> ></div>
</template> </template>

Loading…
Cancel
Save