Skip to content

fix: Next.js hydration mismatches, focus ref logic & performance #731

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

Open
kamilguszpit wants to merge 2 commits into
base: main
Choose a base branch
from
+19 −25
Open

fix: Next.js hydration mismatches, focus ref logic & performance #731

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9dc682b
fix: resolve Next.js hydration mismatches and optimize focus management
kamilguszpit Jan 4, 2026
fc16b40
fix: refine escape key logic based on review
kamilguszpit Jan 4, 2026
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
3 changes: 2 additions & 1 deletion src/hooks.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
import React from 'react';

export const useIsDocumentHidden = () => {
const [isDocumentHidden, setIsDocumentHidden] = React.useState(document.hidden);
const [isDocumentHidden, setIsDocumentHidden] = React.useState(false);

React.useEffect(() => {
setIsDocumentHidden(document.hidden);
const callback = () => {
setIsDocumentHidden(document.hidden);
};
Expand Down
41 changes: 17 additions & 24 deletions src/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -628,17 +628,9 @@ const Toaster = React.forwardRef<HTMLElement, ToasterProps>(function Toaster(pro
const [heights, setHeights] = React.useState<HeightT[]>([]);
const [expanded, setExpanded] = React.useState(false);
const [interacting, setInteracting] = React.useState(false);
const [actualTheme, setActualTheme] = React.useState(
theme !== 'system'
? theme
: typeof window !== 'undefined'
? window.matchMedia && window.matchMedia('(prefers-color-scheme: dark)').matches
? 'dark'
: 'light'
: 'light',
);
const [actualTheme, setActualTheme] = React.useState(theme !== 'system' ? theme : 'light');

const listRef = React.useRef<HTMLOListElement>(null);
const listRefs = React.useRef<Array<HTMLOListElement | null>>([]);
const hotkeyLabel = hotkey.join('+').replace(/Key/g, '').replace(/Digit/g, '');
const lastFocusedElementRef = React.useRef<HTMLElement>(null);
const isFocusWithinRef = React.useRef(false);
Expand Down Expand Up @@ -683,7 +675,7 @@ const Toaster = React.forwardRef<HTMLElement, ToasterProps>(function Toaster(pro
});
});
});
}, [toasts]);
}, []);

React.useEffect(() => {
if (theme !== 'system') {
Expand Down Expand Up @@ -743,12 +735,15 @@ const Toaster = React.forwardRef<HTMLElement, ToasterProps>(function Toaster(pro

if (isHotkeyPressed) {
setExpanded(true);
listRef.current?.focus();
const firstValidList = listRefs.current.find((el) => el);
firstValidList?.focus();
}

if (
event.code === 'Escape' &&
(document.activeElement === listRef.current || listRef.current?.contains(document.activeElement))
listRefs.current.some(
(listRef) => listRef === document.activeElement || listRef?.contains(document.activeElement),
)
) {
setExpanded(false);
}
Expand All @@ -759,16 +754,14 @@ const Toaster = React.forwardRef<HTMLElement, ToasterProps>(function Toaster(pro
}, [hotkey]);

React.useEffect(() => {
if (listRef.current) {
return () => {
if (lastFocusedElementRef.current) {
lastFocusedElementRef.current.focus({ preventScroll: true });
lastFocusedElementRef.current = null;
isFocusWithinRef.current = false;
}
};
}
}, [listRef.current]);
return () => {
if (lastFocusedElementRef.current) {
lastFocusedElementRef.current.focus({ preventScroll: true });
lastFocusedElementRef.current = null;
isFocusWithinRef.current = false;
}
};
}, []);

return (
// Remove item from normal navigation flow, only available via hotkey
Expand All @@ -792,7 +785,7 @@ const Toaster = React.forwardRef<HTMLElement, ToasterProps>(function Toaster(pro
key={position}
dir={dir === 'auto' ? getDocumentDirection() : dir}
tabIndex={-1}
ref={listRef}
ref={(el) => (listRefs.current[index] = el)}
className={className}
data-sonner-toaster
data-sonner-theme={actualTheme}
Expand Down