From 92f7dd20c34a76b0b6055614ec75e45fe6dcbe55 Mon Sep 17 00:00:00 2001
From: Pavel Prichodko <14926950+prichodko@users.noreply.github.com>
Date: Tue, 27 Jun 2023 09:46:10 +0100
Subject: [PATCH] update use-current-breakpoint hook

---
 .../src/hooks/use-current-breakpoint.ts       | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/apps/website/src/hooks/use-current-breakpoint.ts b/apps/website/src/hooks/use-current-breakpoint.ts
index 66b6ee9e..ec5d3316 100644
--- a/apps/website/src/hooks/use-current-breakpoint.ts
+++ b/apps/website/src/hooks/use-current-breakpoint.ts
@@ -8,15 +8,18 @@ import defaultTheme from 'tailwindcss/defaultTheme'
 
 // const fullConfig = resolveConfig(tailwindConfig)
 
-export function useCurrentBreakpoint() {
-  const [currentBreakpoint, setCurrentBreakpoint] = useState('')
+type Breakpoint = keyof (typeof defaultTheme)['screens']
+
+export function useCurrentBreakpoint(): Breakpoint {
+  const [breakpoint, setBreakpoint] = useState<Breakpoint>('sm')
 
   useEffect(() => {
     const handleResize = () => {
       const screenWidth = window.innerWidth
-      const breakpoints = defaultTheme.screens
-        ? Object.entries(defaultTheme.screens)
-        : []
+      const breakpoints = Object.entries(defaultTheme.screens) as [
+        Breakpoint,
+        string
+      ][]
 
       for (let i = breakpoints.length - 1; i >= 0; i--) {
         const [breakpoint, minWidth] = breakpoints[i]
@@ -24,8 +27,8 @@ export function useCurrentBreakpoint() {
         const convertedMinWidth = parseInt(minWidth, 10)
 
         if (screenWidth >= convertedMinWidth) {
-          setCurrentBreakpoint(breakpoint)
-          break
+          setBreakpoint(breakpoint)
+          return
         }
       }
     }
@@ -39,5 +42,5 @@ export function useCurrentBreakpoint() {
     }
   }, [])
 
-  return currentBreakpoint || 'sm' // Default breakpoint if none matches or during SSR
+  return breakpoint
 }