g4borg/cinny
1
0
Fork 0
forked from github/cinny
Code Pull Requests Packages Wiki Activity

Re-add layout as we're no longer oddly passing outlet context

Browse Source
This commit is contained in:
Gigiaj
2025-05-09 11:13:30 -05:00
parent 6714300779
commit eea8ffea05
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/app/pages/Router.tsx
View File

@@ -63,6 +63,7 @@ import { ClientRoomsNotificationPreferences } from './client/ClientRoomsNotifica
import { SpaceSettingsRenderer } from '../features/space-settings'; import { SpaceSettingsRenderer } from '../features/space-settings';
import { CallProvider } from './client/CallProvider'; import { CallProvider } from './client/CallProvider';
import { CallActivationEffect } from './call/CallActivation'; import { CallActivationEffect } from './call/CallActivation';
import { PersistentCallContainer } from './call/PersistentCallContainer';
export const createRouter = (clientConfig: ClientConfig, screenSize: ScreenSize) => { export const createRouter = (clientConfig: ClientConfig, screenSize: ScreenSize) => {
const { hashRouter } = clientConfig; const { hashRouter } = clientConfig;
@@ -125,7 +126,11 @@ export const createRouter = (clientConfig: ClientConfig, screenSize: ScreenSize)
<SidebarNav /> <SidebarNav />
</MobileFriendlyClientNav> </MobileFriendlyClientNav>
} }
/> >
<PersistentCallContainer>
<Outlet />
</PersistentCallContainer>
</ClientLayout>
<CallActivationEffect /> <CallActivationEffect />
</CallProvider> </CallProvider>
<RoomSettingsRenderer /> <RoomSettingsRenderer />
@@ -202,7 +207,9 @@ export const createRouter = (clientConfig: ClientConfig, screenSize: ScreenSize)
<Space /> <Space />
</MobileFriendlyPageNav> </MobileFriendlyPageNav>
} }
></PageRoot> >
<Outlet />
</PageRoot>
</RouteSpaceProvider> </RouteSpaceProvider>
} }
> >