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.

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: prevent event bubbling on cancel button click #922

Merged
merged 2 commits into from
Mar 23, 2022
Merged
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
46 changes: 46 additions & 0 deletions packages/autocomplete-js/src/__tests__/detached.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -85,4 +85,50 @@ describe('detached', () => {
expect(document.body).not.toHaveClass('aa-Detached');
});
});

test('closes after cancel', async () => {
const container = document.createElement('div');
document.body.appendChild(container);
autocomplete<{ label: string }>({
id: 'autocomplete',
detachedMediaQuery: '',
container,
});

const searchButton = container.querySelector<HTMLButtonElement>(
'.aa-DetachedSearchButton'
);

// Open detached overlay
searchButton.click();

await waitFor(() => {
expect(document.querySelector('.aa-DetachedOverlay')).toBeInTheDocument();
expect(document.body).toHaveClass('aa-Detached');
});

const cancelButton = document.querySelector<HTMLButtonElement>(
'.aa-DetachedCancelButton'
);

const bodyClickListener = jest.fn();
document.querySelector('body').addEventListener('click', bodyClickListener);

// Close detached overlay
cancelButton.click();

expect(bodyClickListener).toHaveBeenCalledTimes(0);

document
.querySelector('body')
.removeEventListener('click', bodyClickListener);

// The detached overlay should close
await waitFor(() => {
expect(
document.querySelector('.aa-DetachedOverlay')
).not.toBeInTheDocument();
expect(document.body).not.toHaveClass('aa-Detached');
});
});
});
8 changes: 5 additions & 3 deletions packages/autocomplete-js/src/createAutocompleteDom.ts
Original file line number Diff line number Diff line change
Expand Up @@ -158,17 +158,19 @@ export function createAutocompleteDom<TItem extends BaseItem>({
textContent: placeholder,
});
const detachedSearchButton = createDomElement('button', {
type: 'button',
class: classNames.detachedSearchButton,
onClick(event: MouseEvent) {
event.preventDefault();
onClick() {
setIsModalOpen(true);
},
children: [detachedSearchButtonIcon, detachedSearchButtonPlaceholder],
});
const detachedCancelButton = createDomElement('button', {
type: 'button',
class: classNames.detachedCancelButton,
textContent: translations.detachedCancelButtonText,
onClick() {
onClick(event: MouseEvent) {
event.stopPropagation();
autocomplete.setIsOpen(false);
setIsModalOpen(false);
},
Expand Down