Skip to content

An open source design system that's fully customizable and agent ready

TypeScript

fix(Drawer, MobileNav, Lightbox): a dismissed file picker inside no longer closes them (#8855)

Cindy Zhang1a4158ea3477
diff --git a/.changeset/overlay-cancel-target.md b/.changeset/overlay-cancel-target.md
new file mode 100644
index 0000000000..6e0bd2203f
--- /dev/null
+++ b/.changeset/overlay-cancel-target.md
@@ -0,0 +1,7 @@
+---
+'@astryxdesign/core': patch
+---
+
+[fix] Dismissing a file picker (Escape, or Cancel in the chooser) inside a `Drawer`, `MobileNav` or `Lightbox` no longer closes it and loses what was in it. Only a close request fired at the surface itself closes it, as `Dialog` and `BottomSheet` already do.
+
+@cixzhang
diff --git a/packages/core/src/Drawer/Drawer.test.tsx b/packages/core/src/Drawer/Drawer.test.tsx
index 6b489b7a8b..7832b3c1d9 100644
--- a/packages/core/src/Drawer/Drawer.test.tsx
+++ b/packages/core/src/Drawer/Drawer.test.tsx
@@ -240,6 +240,28 @@ describe('Drawer', () => {
expect(cancelEvent.defaultPrevented).toBe(true);
});
+ // A file input fires a bubbling `cancel` at itself when its picker is
+ // dismissed (Escape, or Cancel in the chooser). It reaches the <dialog>
+ // like a close request but is not one.
+ it('stays open when a file picker inside it is dismissed', () => {
+ const handleOpenChange = vi.fn();
+ render(
+ <Drawer isOpen onOpenChange={handleOpenChange} label="Details">
+ <input type="file" aria-label="Picture" />
+ </Drawer>,
+ );
+ const fromPicker = new Event('cancel', {bubbles: true, cancelable: true});
+ screen.getByLabelText('Picture').dispatchEvent(fromPicker);
+ expect(handleOpenChange).not.toHaveBeenCalled();
+ expect(fromPicker.defaultPrevented).toBe(false);
+ // Its own close request still closes it.
+ screen
+ .getByRole('dialog')
+ .dispatchEvent(new Event('cancel', {cancelable: true}));
+ expect(handleOpenChange).toHaveBeenCalledTimes(1);
+ expect(handleOpenChange).toHaveBeenCalledWith(false);
+ });
+
it('ignores other keys', () => {
const handleOpenChange = vi.fn();
render(
diff --git a/packages/core/src/Drawer/Drawer.tsx b/packages/core/src/Drawer/Drawer.tsx
index 7fa39e041d..119e7d2ec7 100644
--- a/packages/core/src/Drawer/Drawer.tsx
+++ b/packages/core/src/Drawer/Drawer.tsx
@@ -496,6 +496,11 @@ export function Drawer({
// same top-most/IME rules as the shared Escape listener.
const handleCancel = useCallback(
(event: React.SyntheticEvent<HTMLDialogElement>) => {
+ // A cancel that bubbles up from inside (a dismissed file picker) is not
+ // a close request; the platform's is fired at the dialog itself.
+ if (event.target !== event.currentTarget) {
+ return;
+ }
event.preventDefault();
if (shouldDismissOnCloseRequest() && allowEscape) {
handleDismiss();
diff --git a/packages/core/src/Lightbox/Lightbox.test.tsx b/packages/core/src/Lightbox/Lightbox.test.tsx
index f0dc0b3a67..047862d78c 100644
--- a/packages/core/src/Lightbox/Lightbox.test.tsx
+++ b/packages/core/src/Lightbox/Lightbox.test.tsx
@@ -132,6 +132,24 @@ describe('Lightbox', () => {
expect(onOpenChange).toHaveBeenCalledWith(false);
});
+ it('ignores a cancel that bubbles up from inside it', () => {
+ const onOpenChange = vi.fn();
+ render(
+ <Lightbox
+ isOpen={true}
+ onOpenChange={onOpenChange}
+ media={{src: '/photo.jpg', alt: 'Photo'}}
+ />,
+ );
+ // Only a close request fired at the <dialog> itself dismisses; a bubbling
+ // `cancel` from a control inside (a dismissed file picker) does not.
+ const inside = document.querySelector('dialog button')!;
+ const fromInside = new Event('cancel', {bubbles: true, cancelable: true});
+ inside.dispatchEvent(fromInside);
+ expect(onOpenChange).not.toHaveBeenCalled();
+ expect(fromInside.defaultPrevented).toBe(false);
+ });
+
it('calls onOpenChange(false) on Escape via cancel event', () => {
const onOpenChange = vi.fn();
render(
diff --git a/packages/core/src/Lightbox/Lightbox.tsx b/packages/core/src/Lightbox/Lightbox.tsx
index 476487c352..526dca3a37 100644
--- a/packages/core/src/Lightbox/Lightbox.tsx
+++ b/packages/core/src/Lightbox/Lightbox.tsx
@@ -459,6 +459,11 @@ export function Lightbox({
// only, and never while an IME composition is in progress.
const handleCancel = useCallback(
(e: React.SyntheticEvent) => {
+ // A cancel that bubbles up from inside (a dismissed file picker) is not
+ // a close request; the platform's is fired at the dialog itself.
+ if (e.target !== e.currentTarget) {
+ return;
+ }
e.preventDefault();
if (!shouldDismissOnCloseRequest()) {
return;
diff --git a/packages/core/src/MobileNav/MobileNav.test.tsx b/packages/core/src/MobileNav/MobileNav.test.tsx
index 9658795cae..591abf58df 100644
--- a/packages/core/src/MobileNav/MobileNav.test.tsx
+++ b/packages/core/src/MobileNav/MobileNav.test.tsx
@@ -54,6 +54,21 @@ describe('MobileNav', () => {
expect(dialog).not.toHaveAttribute('open');
});
+ it('stays open when a file picker inside it is dismissed', () => {
+ const handleClose = vi.fn();
+ render(
+ <MobileNav isOpen={true} onOpenChange={handleClose}>
+ <input type="file" aria-label="Picture" />
+ </MobileNav>,
+ );
+ // A dismissed picker fires a bubbling `cancel` at the input; it is not a
+ // close request for the navigation.
+ const fromPicker = new Event('cancel', {bubbles: true, cancelable: true});
+ screen.getByLabelText('Picture').dispatchEvent(fromPicker);
+ expect(handleClose).not.toHaveBeenCalled();
+ expect(fromPicker.defaultPrevented).toBe(false);
+ });
+
it('calls onOpenChange(false) on native cancel event (Escape)', () => {
const handleClose = vi.fn();
render(
diff --git a/packages/core/src/MobileNav/MobileNav.tsx b/packages/core/src/MobileNav/MobileNav.tsx
index 0da8e0abd7..26f379712d 100644
--- a/packages/core/src/MobileNav/MobileNav.tsx
+++ b/packages/core/src/MobileNav/MobileNav.tsx
@@ -648,6 +648,11 @@ export function MobileNav({
// only, and never while an IME composition is in progress.
const handleCancel = useCallback(
(event: React.SyntheticEvent<HTMLDialogElement>) => {
+ // A cancel that bubbles up from inside (a dismissed file picker) is not
+ // a close request; the platform's is fired at the dialog itself.
+ if (event.target !== event.currentTarget) {
+ return;
+ }
event.preventDefault();
if (!shouldDismissOnCloseRequest()) {
return;