Skip to content

Commit f147355

Browse files
committed
1 parent 7789b02 commit f147355

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

src/useIsDark/client.ts

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ function getSystemColorScheme() {
4545
}
4646

4747
export const useIsDarkClientSide: UseIsDark = () => {
48-
const [, reRender] = useReducer(() => [], []);
48+
const [isFirstRenderingOfTheComponent, reRender] = useReducer(() => false, true);
4949

5050
useEffect(() => {
5151
reRender();
@@ -54,9 +54,10 @@ export const useIsDarkClientSide: UseIsDark = () => {
5454
useRerenderOnChange($clientSideIsDark);
5555
useRerenderOnChange($isAfterFirstEffect);
5656

57-
const isDark = $isAfterFirstEffect.current
58-
? $clientSideIsDark.current
59-
: ssrWasPerformedWithIsDark;
57+
const isDark =
58+
isFirstRenderingOfTheComponent || !$isAfterFirstEffect.current
59+
? ssrWasPerformedWithIsDark
60+
: $clientSideIsDark.current;
6061

6162
const setIsDark = useConstCallback<ReturnType<UseIsDark>["setIsDark"]>(
6263
newIsDarkOrDeduceNewIsDarkFromCurrentIsDark => {

0 commit comments

Comments
 (0)