Skip to content

The Postgres development platform. Supabase gives you a dedicated Postgres database to build your web, mobile, and AI applications.

feat(studio): add loading and fallback states to SPA shell (#48185)

Alaister Young1144b8388512
diff --git a/apps/studio/components/interfaces/App/ShellFallback.tsx b/apps/studio/components/interfaces/App/ShellFallback.tsx
new file mode 100644
index 00000000000..ff6a1666af7
--- /dev/null
+++ b/apps/studio/components/interfaces/App/ShellFallback.tsx
@@ -0,0 +1,73 @@
+import { LogoLoader } from 'ui'
+
+import { IS_PLATFORM } from '@/lib/constants'
+
+// Baked into the prerendered SPA shell (_shell.html) — this is the static HTML
+// shown on every cold load until the JS bundle hydrates, so nothing here can
+// rely on JS: the loader animation, the 7s stuck-load help reveal, and the
+// noscript message are all pure CSS/HTML.
+export function ShellFallback() {
+ return (
+ <>
+ <style>{`
+ /* visibility (not just opacity) so the text is also hidden from
+ screen readers until the reveal. */
+ #studio-shell-help {
+ visibility: hidden;
+ opacity: 0;
+ animation: studio-shell-help-reveal 0.3s ease-out 7s forwards;
+ }
+ @keyframes studio-shell-help-reveal {
+ to {
+ visibility: visible;
+ opacity: 1;
+ }
+ }
+ `}</style>
+ <div
+ id="studio-shell-loader"
+ className="fixed inset-0 flex flex-col items-center justify-center gap-8 p-4"
+ >
+ {/* LogoLoader fills its parent, so give it a fixed-height box — otherwise
+ it stretches to the full column and pushes the help text offscreen. */}
+ <div className="h-[62px] w-full">
+ <LogoLoader />
+ </div>
+ {/* data-nosnippet keeps Google from surfacing this boilerplate as the
+ search snippet for dashboard URLs (the shell serves every route). */}
+ <p
+ id="studio-shell-help"
+ data-nosnippet=""
+ className="max-w-md text-center text-sm text-foreground-light"
+ >
+ Taking longer than expected? Try clearing your browser cookies and reloading the page.
+ {IS_PLATFORM && (
+ <>
+ {' '}
+ If the problem persists, contact{' '}
+ <a href="mailto:[email protected]" className="underline">
+ </a>
+ .
+ </>
+ )}
+ </p>
+ </div>
+ {/* dangerouslySetInnerHTML keeps React hydration from diffing noscript
+ children, which the server renders as real markup but the client
+ treats as raw text. */}
+ <noscript
+ dangerouslySetInnerHTML={{
+ __html: `
+ <style>#studio-shell-loader{display:none}</style>
+ <div data-nosnippet class="fixed inset-0 flex items-center justify-center p-4">
+ <p class="text-sm text-foreground-light text-center">
+ Supabase Studio requires JavaScript. Enable JavaScript in your browser settings and reload the page.
+ </p>
+ </div>
+ `,
+ }}
+ />
+ </>
+ )
+}
diff --git a/apps/studio/routes/__root.tsx b/apps/studio/routes/__root.tsx
index 6766027df62..a8b53eb521b 100644
--- a/apps/studio/routes/__root.tsx
+++ b/apps/studio/routes/__root.tsx
@@ -25,6 +25,7 @@ import { TanStackDevtools } from '@tanstack/react-devtools'
import type { QueryClient } from '@tanstack/react-query'
import { ReactQueryDevtoolsPanel } from '@tanstack/react-query-devtools'
import {
+ ClientOnly,
createRootRouteWithContext,
HeadContent,
Outlet,
@@ -65,6 +66,7 @@ import { FeaturePreviewContextProvider } from '@/components/interfaces/App/Featu
import { FeaturePreviewModal } from '@/components/interfaces/App/FeaturePreview/FeaturePreviewModal'
import { MonacoThemeProvider } from '@/components/interfaces/App/MonacoThemeProvider'
import { RouteValidationWrapper } from '@/components/interfaces/App/RouteValidationWrapper'
+import { ShellFallback } from '@/components/interfaces/App/ShellFallback'
import { MainScrollContainerProvider } from '@/components/layouts/MainScrollContainerContext'
import { BannerStackProvider } from '@/components/ui/BannerStack/BannerStackProvider'
import { GlobalErrorBoundaryState } from '@/components/ui/ErrorBoundary/GlobalErrorBoundaryState'
@@ -364,7 +366,9 @@ function RootComponent() {
<BannerStackProvider>
<FeaturePreviewContextProvider>
<MainScrollContainerProvider>
- <Outlet />
+ <ClientOnly fallback={<ShellFallback />}>
+ <Outlet />
+ </ClientOnly>
</MainScrollContainerProvider>
<GlobalShortcuts />
<StudioCommandMenu />