Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

refactor(console): delay module loading suspense component display by 500ms #6345

Merged
merged 2 commits into from
Aug 1, 2024
Merged

refactor(console): delay module loading suspense component display by 500ms #6345

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
44dde14
refactor(console): delay module loading suspense component display by…
charIeszhao Jul 26, 2024
660de28
refactor(console): polish code per comment
charIeszhao Jul 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 23 additions & 2 deletions packages/console/src/containers/ConsoleContent/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Suspense } from 'react';
import { Suspense, useEffect, useState } from 'react';
import { useOutletContext, useRoutes } from 'react-router-dom';
import { safeLazy } from 'react-safe-lazy';

Expand All @@ -15,8 +15,29 @@ import { Skeleton } from './Sidebar';
import useTenantScopeListener from './hooks';
import styles from './index.module.scss';

const suspenseDisplayTimeout = 500; // Milliseconds
const Sidebar = safeLazy(async () => import('./Sidebar'));

function SuspenseFallback() {
const [showSpinner, setShowSpinner] = useState(false);

useEffect(() => {
const timeout = window.setTimeout(() => {
setShowSpinner(true);
}, suspenseDisplayTimeout);

return () => {
clearTimeout(timeout);
};
}, []);

if (showSpinner) {
return <Daisy className={styles.daisy} />;
}

return null;
}

function ConsoleContent() {
const { scrollableContent } = useOutletContext<AppContentOutletContext>();
const routeObjects = useConsoleRoutes();
Expand All @@ -33,7 +54,7 @@ function ConsoleContent() {
</Suspense>
<OverlayScrollbar className={styles.overlayScrollbarWrapper}>
<div ref={scrollableContent} className={styles.main}>
<Suspense fallback={<Daisy className={styles.daisy} />}>{routes}</Suspense>
<Suspense fallback={<SuspenseFallback />}>{routes}</Suspense>
</div>
</OverlayScrollbar>
{isDevFeaturesEnabled && (
Expand Down
Loading