chore: merge main

jpudysz · Nov 6, 2023 · b7093cf · b7093cf
2 parents bd93bf2 + 4deb55b
commit b7093cf
Showing 1 changed file with 9 additions and 6 deletions.
diff --git a/src/hooks/useDimensions.web.ts b/src/hooks/useDimensions.web.ts
@@ -1,13 +1,16 @@
-import { useEffect, useRef, useState } from 'react'
+import { useEffect, useLayoutEffect, useRef, useState } from 'react'
 import type { ScreenSize } from '../types'
-import { isServer } from '../utils'
 
 export const useDimensions = (): ScreenSize => {
     const timerRef = useRef<ReturnType<typeof setTimeout>>()
-    const [screenSize, setScreenSize] = useState<ScreenSize>({
-        width: isServer ? 0 : window.innerWidth,
-        height: isServer ? 0 : window.innerHeight
-    })
+    const [screenSize, setScreenSize] = useState<ScreenSize>({} as ScreenSize)
+
+    useLayoutEffect(() => {
+        setScreenSize({
+            width: window.innerWidth,
+            height: window.innerHeight
+        })
+    }, [])
 
     useEffect(() => {
         const handleResize = () => {