Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion packages/core/src/components/drawer/drawer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -87,9 +87,11 @@ export class Drawer {

@State() showContent = true;

private isClosing = false;

@Watch('show')
onShowChanged(newValue: boolean, oldValue?: boolean) {
if (newValue === oldValue) {
if (newValue === oldValue || this.isClosing) {
return;
}

Expand Down Expand Up @@ -119,9 +121,11 @@ export class Drawer {
}, Animation.mediumTime);
}
} else {
this.isClosing = true;
const { defaultPrevented } = this.drawerClose.emit();

if (defaultPrevented) {
this.isClosing = false;
return;
}

Expand All @@ -132,6 +136,7 @@ export class Drawer {
}

window.removeEventListener('mousedown', this.callback);
this.isClosing = false;
}

this.toggle = this.show;
Expand Down
31 changes: 31 additions & 0 deletions packages/core/src/components/drawer/test/drawer.ct.ts
Original file line number Diff line number Diff line change
Expand Up @@ -86,3 +86,34 @@ regressionTest('drawerClose', async ({ mount, page }) => {
await drawer.evaluate((d: HTMLIxDrawerElement) => (d.show = false));
await expect(drawer).toBeVisible();
});
regressionTest(
'close button should emit drawerClose event only once',
async ({ mount, page }) => {
await mount('<ix-drawer show>Content</ix-drawer>');
const drawer = page.locator('ix-drawer');
await expect(drawer).toHaveClass(/hydrated/);

await drawer.evaluate((d: HTMLIxDrawerElement) => {
d.addEventListener('drawerClose', () => {}, { once: true });
});

const closeButton = page.locator(
'ix-drawer ix-icon-button[data-testid="close-button"]'
);

const eventPromise = drawer.evaluate((d: HTMLIxDrawerElement) => {
return new Promise<void>((resolve) => {
d.addEventListener('drawerClose', () => resolve(), { once: true });
});
});

await closeButton.click();
await eventPromise;

const drawerShow = await drawer.evaluate(
(d: HTMLIxDrawerElement) => d.show
);
expect(drawerShow).toBe(false);
await expect(drawer).not.toBeVisible();
}
);