Spinner only appears on home page

pmndrs · Aug 3, 2024 · f21a812 · f21a812
1 parent 7db604a
commit f21a812
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/app/Canvas.tsx b/app/Canvas.tsx
@@ -164,21 +164,18 @@ function SubscribeToFrameloop() {
 type CanvasApi = {
   isPaused: boolean
   isLoaded: boolean
-  isLazyLoaded: boolean
   pause: () => void
   play: () => void
   onPauseCallbacks: (() => void)[]
   onPlayCallbacks: (() => void)[]
   onPause: (callback: () => void) => () => void
   onPlay: (callback: () => void) => () => void
   setIsLoaded: (isLoaded: boolean) => void
-  setIsLazyLoaded: (isLazyLoaded: boolean) => void
 }
 
 export const useCanvasApi = create<CanvasApi>((set, get) => ({
   isPaused: true,
   isLoaded: false,
-  isLazyLoaded: typeof window === 'undefined' ? false : window.location.pathname !== '/',
   onPauseCallbacks: [],
   onPlayCallbacks: [],
   onPause: (callback) => {
@@ -206,5 +203,4 @@ export const useCanvasApi = create<CanvasApi>((set, get) => ({
     onPlay.forEach((fn) => fn())
   },
   setIsLoaded: (isLoaded) => set({ isLoaded }),
-  setIsLazyLoaded: (isLazyLoaded) => set({ isLazyLoaded }),
 }))
diff --git a/components/Spinner.tsx b/components/Spinner.tsx
@@ -1,11 +1,14 @@
 'use client'
 import { useSpring, a } from '@react-spring/web'
 import { useCanvasApi } from 'app/Canvas'
+import { usePathname } from 'next/navigation'
 import { useEffect } from 'react'
 
 export function Spinner() {
   const isLoaded = useCanvasApi((state) => state.isLoaded)
-  const isLazyLoaded = useCanvasApi((state) => state.isLazyLoaded)
+  const pathname = usePathname()
+
+  const isLazyLoaded = pathname !== '/'
 
   const [props, springApi] = useSpring(() => ({ opacity: isLazyLoaded ? 0 : 1 }))