Skip to content

Commit 244c6ec

Browse files
committed
fix: avoid lazy search modal chunk cycle
1 parent 8fd43df commit 244c6ec

File tree

1 file changed

+3
-20
lines changed

1 file changed

+3
-20
lines changed

src/routes/__root.tsx

Lines changed: 3 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,9 @@ const LazyRouterDevtools = React.lazy(() =>
1919
import { NotFound } from '~/components/NotFound'
2020
import { DefaultCatchBoundary } from '~/components/DefaultCatchBoundary'
2121
import { SearchProvider, useSearchContext } from '~/contexts/SearchContext'
22+
import { SearchModal } from '~/components/SearchModal'
2223
import { ToastProvider } from '~/components/ToastProvider'
2324
import { LoginModalProvider } from '~/contexts/LoginModalContext'
24-
25-
const LazySearchModal = React.lazy(() =>
26-
import('~/components/SearchModal').then((m) => ({ default: m.SearchModal })),
27-
)
2825
import { Spinner } from '~/components/Spinner'
2926
import { ThemeProvider, useHtmlClass } from '~/components/ThemeProvider'
3027
import { Navbar } from '~/components/Navbar'
@@ -210,8 +207,7 @@ function ShellComponent({ children }: { children: React.ReactNode }) {
210207
}
211208

212209
function SearchHotkeyController() {
213-
const { isOpen, openSearch } = useSearchContext()
214-
const [hasOpenedSearch, setHasOpenedSearch] = React.useState(false)
210+
const { openSearch } = useSearchContext()
215211

216212
React.useEffect(() => {
217213
const handleGlobalKeyDown = (event: KeyboardEvent) => {
@@ -220,7 +216,6 @@ function SearchHotkeyController() {
220216
if (event.key.toLowerCase() !== 'k') return
221217

222218
event.preventDefault()
223-
setHasOpenedSearch(true)
224219
openSearch()
225220
}
226221

@@ -230,19 +225,7 @@ function SearchHotkeyController() {
230225
}
231226
}, [openSearch])
232227

233-
React.useEffect(() => {
234-
if (isOpen) {
235-
setHasOpenedSearch(true)
236-
}
237-
}, [isOpen])
238-
239-
if (!hasOpenedSearch) return null
240-
241-
return (
242-
<React.Suspense fallback={null}>
243-
<LazySearchModal />
244-
</React.Suspense>
245-
)
228+
return <SearchModal />
246229
}
247230

248231
function IdleGtmLoader() {

0 commit comments

Comments
 (0)