fix: lazy loading messing up custom css

This commit is contained in:
Zamitto 2025-02-18 22:25:41 -03:00
parent 726a39a430
commit 73ab3872a7
3 changed files with 18 additions and 49 deletions

View file

@ -263,9 +263,7 @@ export function App() {
useEffect(() => { useEffect(() => {
const unsubscribe = window.electron.onCssInjected((cssString) => { const unsubscribe = window.electron.onCssInjected((cssString) => {
if (cssString) { injectCustomCss(cssString);
injectCustomCss(cssString);
}
}); });
return () => unsubscribe(); return () => unsubscribe();

View file

@ -18,26 +18,17 @@ import { store } from "./store";
import resources from "@locales"; import resources from "@locales";
import { SuspenseWrapper } from "./components";
import { logger } from "./logger"; import { logger } from "./logger";
import { addCookieInterceptor } from "./cookies"; import { addCookieInterceptor } from "./cookies";
const Home = React.lazy(() => import("./pages/home/home"));
const GameDetails = React.lazy(
() => import("./pages/game-details/game-details")
);
const Downloads = React.lazy(() => import("./pages/downloads/downloads"));
const Settings = React.lazy(() => import("./pages/settings/settings"));
const Catalogue = React.lazy(() => import("./pages/catalogue/catalogue"));
const Profile = React.lazy(() => import("./pages/profile/profile"));
const Achievements = React.lazy(
() => import("./pages/achievements/achievements")
);
const ThemeEditor = React.lazy(
() => import("./pages/theme-editor/theme-editor")
);
import * as Sentry from "@sentry/react"; import * as Sentry from "@sentry/react";
import Catalogue from "./pages/catalogue/catalogue";
import Home from "./pages/home/home";
import Downloads from "./pages/downloads/downloads";
import GameDetails from "./pages/game-details/game-details";
import Settings from "./pages/settings/settings";
import Profile from "./pages/profile/profile";
import Achievements from "./pages/achievements/achievements";
import ThemeEditor from "./pages/theme-editor/theme-editor";
Sentry.init({ Sentry.init({
dsn: import.meta.env.RENDERER_VITE_SENTRY_DSN, dsn: import.meta.env.RENDERER_VITE_SENTRY_DSN,
@ -82,37 +73,16 @@ ReactDOM.createRoot(document.getElementById("root")!).render(
<HashRouter> <HashRouter>
<Routes> <Routes>
<Route element={<App />}> <Route element={<App />}>
<Route path="/" element={<SuspenseWrapper Component={Home} />} /> <Route path="/" element={<Home />} />
<Route <Route path="/catalogue" element={<Catalogue />} />
path="/catalogue" <Route path="/downloads" element={<Downloads />} />
element={<SuspenseWrapper Component={Catalogue} />} <Route path="/game/:shop/:objectId" element={<GameDetails />} />
/> <Route path="/settings" element={<Settings />} />
<Route <Route path="/profile/:userId" element={<Profile />} />
path="/downloads" <Route path="/achievements" element={<Achievements />} />
element={<SuspenseWrapper Component={Downloads} />}
/>
<Route
path="/game/:shop/:objectId"
element={<SuspenseWrapper Component={GameDetails} />}
/>
<Route
path="/settings"
element={<SuspenseWrapper Component={Settings} />}
/>
<Route
path="/profile/:userId"
element={<SuspenseWrapper Component={Profile} />}
/>
<Route
path="/achievements"
element={<SuspenseWrapper Component={Achievements} />}
/>
</Route> </Route>
<Route <Route path="/theme-editor" element={<ThemeEditor />} />
path="/theme-editor"
element={<SuspenseWrapper Component={ThemeEditor} />}
/>
</Routes> </Routes>
</HashRouter> </HashRouter>
</Provider> </Provider>

View file

@ -110,6 +110,7 @@ export function SettingsAppearance({
onClose={() => { onClose={() => {
setIsImportThemeModalVisible(false); setIsImportThemeModalVisible(false);
clearTheme(); clearTheme();
setHasShownModal(false);
}} }}
onThemeImported={onThemeImported} onThemeImported={onThemeImported}
themeName={importTheme.theme} themeName={importTheme.theme}