Skip to content

Free, Open Source, Self-Hosted WhatsApp API Gateway

fix(dashboard): move focus into the contact panel when it opens

Yudhi Armyndharis1682b048421c
diff --git a/dashboard/src/pages/Chats.features.test.ts b/dashboard/src/pages/Chats.features.test.ts
index 352a84a44..68852b1d7 100644
--- a/dashboard/src/pages/Chats.features.test.ts
+++ b/dashboard/src/pages/Chats.features.test.ts
@@ -505,6 +505,30 @@ test('the page and the open room keep a heading, and closing the panel returns f
assert.equal(focusedName(), 'Contact info', 'Escape dropped focus');
});
+test('opening the contact panel takes focus to its close button, from the toggle and from the contact', async () => {
+ const { screen, fireEvent, waitFor, within } = rtl;
+ const { container } = renderPage();
+ fireEvent.click(await screen.findByText('Alice'));
+ await waitFor(() => assert.ok(container.querySelector('.room-header'), 'the room did not open'));
+ const panel = () => container.querySelector('.contact-info-panel') as HTMLElement;
+ // Below 1200px the panel covers the room, so focus left on the toggle would sit under it.
+ const onClose = () => panel().contains(document.activeElement) && focusedName() === 'Close';
+
+ const toggle = screen.getByRole('button', { name: 'Contact info' });
+ toggle.focus();
+ fireEvent.click(toggle);
+ await waitFor(() => assert.ok(panel(), 'the panel did not open'));
+ assert.equal(onClose(), true, `focus is on "${focusedName()}", not in the panel`);
+ fireEvent.keyDown(document, { key: 'Escape' });
+ assert.equal(focusedName(), 'Contact info', 'Escape did not return focus to the toggle');
+
+ fireEvent.click(container.querySelector('.room-contact') as HTMLElement);
+ await waitFor(() => assert.ok(panel(), 'the panel did not open from the contact'));
+ assert.equal(onClose(), true, `focus is on "${focusedName()}", not in the panel`);
+ fireEvent.click(within(panel()).getByRole('button', { name: 'Close' }));
+ assert.equal(focusedName(), 'Contact info', 'closing the panel did not return focus to the toggle');
+});
+
test("a group's panel is its group info, not contact info", async () => {
const { screen, fireEvent, waitFor } = rtl;
listGroup = true;
diff --git a/dashboard/src/pages/Chats.tsx b/dashboard/src/pages/Chats.tsx
index 1a2e5f2a6..4c32cd010 100644
--- a/dashboard/src/pages/Chats.tsx
+++ b/dashboard/src/pages/Chats.tsx
@@ -2192,12 +2192,15 @@ export function Chats() {
{activeChat && showContactInfo && (
<aside className="contact-info-panel" aria-label={contactInfoLabel}>
<header className="contact-info-header">
+ {/* Opening the panel takes focus into it: below 1200px it covers the room, the button that opened it
+ and the stops after it. Closing it returns focus to the toggle. */}
<button
type="button"
className="icon-btn"
onClick={closeContactInfo}
aria-label={t('common.close')}
title={t('common.close')}
+ autoFocus
>
<X size={20} />
</button>