Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(elements): close drawer when pressing Escape #3371

Merged
merged 1 commit into from
Aug 22, 2024
Merged

fix(elements): close drawer when pressing Escape #3371

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
27 changes: 23 additions & 4 deletions packages/elements/src/components/drawer/drawer.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { ResizeController } from '@lit-labs/observers/resize-controller.js';
import { html, LitElement, nothing, unsafeCSS } from 'lit';
import { customElement, property } from 'lit/decorators.js';
import { classMap } from 'lit/directives/class-map.js';
import type { Ref } from 'lit/directives/ref.js';
import { createRef, ref } from 'lit/directives/ref.js';
import { styleMap } from 'lit/directives/style-map.js';
import { renderIf } from '../../lib/html-helpers.js';
import { tailwind } from '../../style/index.js';
import { renderEmoji } from '../drawer-mutant/util.js';
Expand Down Expand Up @@ -63,9 +63,25 @@ export class MutationTestReportDrawer extends LitElement {
event.stopImmediatePropagation();
};

connectedCallback(): void {
super.connectedCallback();
window.addEventListener('keydown', this.#handleKeyDown);
}

disconnectedCallback(): void {
window.removeEventListener('keydown', this.#handleKeyDown);
super.disconnectedCallback();
}

#handleKeyDown = (event: KeyboardEvent) => {
if (event.key === 'Escape') {
this.mode = 'closed';
}
};

render() {
const contentHeight = this.#contentHeightController.value;
const styles = styleMap({ height: contentHeight ? `${contentHeight}px` : undefined });
const isOpen = this.mode === 'open';
const height = this.#contentHeightController.value;

return html`<aside @click="${(event: Event) => event.stopPropagation()}" class="ml-6 mr-4">
<header class="w-full py-4" ${ref(this.#headerRef)}>
Expand All @@ -77,7 +93,10 @@ export class MutationTestReportDrawer extends LitElement {
)}
</h2>
</header>
<div style="${styles}" class="mb-4 overflow-y-auto motion-safe:transition-max-width">
<div
style="${height && isOpen ? `height: ${height}px;` : nothing}"
class="${classMap({ ['mb-4 motion-safe:transition-max-width']: true, 'overflow-y-auto': isOpen })}"
>
<slot name="summary"></slot>
${renderIf(this.hasDetail && this.mode === 'open', html`<slot name="detail"></slot>`)}
</div>
Expand Down
11 changes: 11 additions & 0 deletions packages/elements/test/unit/components/drawer.component.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { MutationTestReportDrawer } from '../../../src/components/drawer/drawer.component.js';
import { CustomElementFixture } from '../helpers/CustomElementFixture.js';
import { userEvent } from '@vitest/browser/context';

describe(MutationTestReportDrawer.name, () => {
let sut: CustomElementFixture<MutationTestReportDrawer>;
Expand Down Expand Up @@ -72,6 +73,16 @@ describe(MutationTestReportDrawer.name, () => {
const event = await sut.catchNativeEvent('click', () => sut.$<HTMLElement>('header').click());
expect(event).undefined;
});

it('should close when escape is pressed', async () => {
sut.element.mode = 'open';
await sut.whenStable();

await userEvent.keyboard('{Escape}');
await sut.whenStable();

expect(sut.element).toHaveProperty('mode', 'closed');
});
});

function readMoreToggle(): HTMLElement {
Expand Down
Loading