fix(pwa): focus existing window on notification click

The service worker's notificationclick handler called
self.clients.openWindow(url) unconditionally, spawning a new window/PWA
instance on every notification click even when one was already open.

Focus an existing window client and navigate it to the (relative)
deep-link, resolved against self.location.origin, falling back to
openWindow only when no window is available.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
Brian Ketelsen
2026-06-30 23:26:51 -04:00
co-authored by Claude Opus 4.8
parent 4e0dded547
commit 72a24c388f
+26 -1
View File
@@ -67,5 +67,30 @@ self.addEventListener('notificationclick', (event) => {
const data = (event.notification.data ?? null) as { url?: string } | null;
const url = data?.url ?? '/';
event.waitUntil(self.clients.openWindow(url));
event.waitUntil((async () => {
// Prefer focusing an already-open window (e.g. the installed PWA) and
// navigating it to the target, instead of always spawning a new window.
const target = new URL(url, self.location.origin).href;
const windowClients = await self.clients.matchAll({
type: 'window',
includeUncontrolled: true,
});
for (const client of windowClients) {
try {
if ('navigate' in client) {
await client.navigate(target);
}
} catch {
// navigate() can reject for uncontrolled clients; fall back to focus.
}
if ('focus' in client) {
return client.focus();
}
}
if (self.clients.openWindow) {
return self.clients.openWindow(target);
}
})());
});