fix: prevent custom logo blink with global loading state

This commit is contained in:
Steven RYDELL
2026-07-30 15:42:27 +02:00
parent fe24a9bec0
commit 25a38cd560
2 changed files with 70 additions and 41 deletions
+59
View File
@@ -6,17 +6,30 @@
import { create } from 'zustand';
import { persist } from 'zustand/middleware';
import { getApiBaseUrl } from '@/services/api';
export type Theme = 'light' | 'dark';
export type ColorTheme = 'stalwart' | 'ocean' | 'forest' | 'violet';
export type Radius = 'rounded' | 'square';
let logoAbortController: AbortController | null = null;
let logoObjectUrl: string | null = null;
function revokeLogoObjectUrl() {
if (logoObjectUrl) {
URL.revokeObjectURL(logoObjectUrl);
logoObjectUrl = null;
}
}
interface UIState {
theme: Theme;
colorTheme: ColorTheme;
radius: Radius;
sidebarOpen: boolean;
activeSection: string;
logoUrl: string | null;
logoLoading: boolean;
setTheme: (theme: Theme) => void;
setColorTheme: (colorTheme: ColorTheme) => void;
@@ -24,6 +37,9 @@ interface UIState {
toggleSidebar: () => void;
setSidebarOpen: (open: boolean) => void;
setActiveSection: (section: string) => void;
setLogoUrl: (url: string | null) => void;
setLogoLoading: (loading: boolean) => void;
fetchLogo: () => void;
}
function applyThemeClass(theme: Theme) {
@@ -68,6 +84,49 @@ export const useUIStore = create<UIState>()(
radius: 'rounded',
sidebarOpen: typeof window !== 'undefined' ? (window.matchMedia?.('(min-width: 768px)').matches ?? true) : true,
activeSection: '',
logoUrl: null,
logoLoading: false,
setLogoUrl: (url) => {
revokeLogoObjectUrl();
if (url) {
logoObjectUrl = url;
}
set({ logoUrl: url, logoLoading: false });
},
setLogoLoading: (loading) => {
set({ logoLoading: loading });
},
fetchLogo: () => {
const { logoUrl, logoLoading } = get();
if (logoUrl !== null || logoLoading) return;
set({ logoLoading: true });
if (logoAbortController) {
logoAbortController.abort();
}
logoAbortController = new AbortController();
fetch(`${getApiBaseUrl()}/logo`, {
signal: logoAbortController.signal,
})
.then((response) => {
const contentType = response.headers.get('content-type') ?? '';
if (response.ok && contentType.startsWith('image/')) {
return response.blob().then((blob) => {
revokeLogoObjectUrl();
logoObjectUrl = URL.createObjectURL(blob);
set({ logoUrl: logoObjectUrl, logoLoading: false });
});
}
set({ logoUrl: null, logoLoading: false });
})
.catch(() => {
set({ logoUrl: null, logoLoading: false });
});
},
setTheme: (theme) => {
applyThemeClass(theme);