Skip to content

Commit 0b04ee0

Browse files
fix(ui): wait for nav api to be ready before loading main app component
1 parent db014d0 commit 0b04ee0

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

invokeai/frontend/web/src/app/components/App.tsx

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
11
import { Box } from '@invoke-ai/ui-library';
2+
import { useStore } from '@nanostores/react';
23
import { GlobalHookIsolator } from 'app/components/GlobalHookIsolator';
34
import { GlobalModalIsolator } from 'app/components/GlobalModalIsolator';
45
import { clearStorage } from 'app/store/enhancers/reduxRemember/driver';
6+
import Loading from 'common/components/Loading/Loading';
57
import { AppContent } from 'features/ui/components/AppContent';
8+
import { navigationApi } from 'features/ui/layouts/navigation-api';
69
import { memo } from 'react';
710
import { ErrorBoundary } from 'react-error-boundary';
811

@@ -16,11 +19,12 @@ const errorBoundaryOnReset = () => {
1619
};
1720

1821
const App = () => {
22+
const isNavigationAPIConnected = useStore(navigationApi.$isConnected);
1923
return (
2024
<ThemeLocaleProvider>
2125
<ErrorBoundary onReset={errorBoundaryOnReset} FallbackComponent={AppErrorBoundaryFallback}>
2226
<Box id="invoke-app-wrapper" w="100dvw" h="100dvh" position="relative" overflow="hidden">
23-
<AppContent />
27+
{isNavigationAPIConnected ? <AppContent /> : <Loading />}
2428
</Box>
2529
<GlobalHookIsolator />
2630
<GlobalModalIsolator />

invokeai/frontend/web/src/app/components/GlobalHookIsolator.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,14 @@ export const GlobalHookIsolator = memo(() => {
3434
const dispatch = useAppDispatch();
3535

3636
// singleton!
37+
useNavigationApi();
3738
useReadinessWatcher();
3839
useSocketIO();
3940
useGlobalModifiersInit();
4041
useGlobalHotkeys();
4142
useGetOpenAPISchemaQuery();
4243
useSyncLoggingConfig();
4344
useCloseChakraTooltipsOnDragFix();
44-
useNavigationApi();
4545
useDndMonitor();
4646
useSyncNodeErrors();
4747
useSyncLangDirection();

0 commit comments

Comments
 (0)