Skip to content

Commit b19809d

Browse files
totegammatotegamma
authored
Merge pull request #925 from concrnt/develop
fix audioplayer
2 parents f560e17 + 19c5cf4 commit b19809d

2 files changed

Lines changed: 261 additions & 250 deletions

File tree

‎app/src/App.tsx‎

Lines changed: 70 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ import { DeckPage } from './pages/Deck'
4545
import { TimelineProvider } from './context/TimelineProvider'
4646
import { InspectorProvider } from './context/Inspector'
4747
import { ProfileProvider } from './context/ProfileContext'
48-
import { AudioPlayerProvider } from './context/AudioPlayer'
48+
import { AudioPlayerOutlet, AudioPlayerProvider } from './context/AudioPlayer'
4949

5050
const SwitchMasterToSub = lazy(() => import('./components/SwitchMasterToSub'))
5151

@@ -340,33 +340,35 @@ function App(): JSX.Element {
340340
<TickerProvider>
341341
<UrlSummaryProvider host={client.host}>
342342
<MediaViewerProvider>
343-
<EmojiPickerProvider>
344-
<StorageProvider>
345-
<ConcordProvider>
346-
<EditorModalProvider>
347-
<TimelineDrawerProvider>
348-
<UserDrawerProvider>
349-
<ProfileProvider>
350-
<SearchDrawerProvider>
351-
<ConfirmProvider>
352-
<InspectorProvider>
353-
<GlobalActionsProvider>
354-
<TimelineProvider>
355-
<CommandPaletteProvider>
356-
{childs}
357-
</CommandPaletteProvider>
358-
</TimelineProvider>
359-
</GlobalActionsProvider>
360-
</InspectorProvider>
361-
</ConfirmProvider>
362-
</SearchDrawerProvider>
363-
</ProfileProvider>
364-
</UserDrawerProvider>
365-
</TimelineDrawerProvider>
366-
</EditorModalProvider>
367-
</ConcordProvider>
368-
</StorageProvider>
369-
</EmojiPickerProvider>
343+
<AudioPlayerProvider>
344+
<EmojiPickerProvider>
345+
<StorageProvider>
346+
<ConcordProvider>
347+
<EditorModalProvider>
348+
<TimelineDrawerProvider>
349+
<UserDrawerProvider>
350+
<ProfileProvider>
351+
<SearchDrawerProvider>
352+
<ConfirmProvider>
353+
<InspectorProvider>
354+
<GlobalActionsProvider>
355+
<TimelineProvider>
356+
<CommandPaletteProvider>
357+
{childs}
358+
</CommandPaletteProvider>
359+
</TimelineProvider>
360+
</GlobalActionsProvider>
361+
</InspectorProvider>
362+
</ConfirmProvider>
363+
</SearchDrawerProvider>
364+
</ProfileProvider>
365+
</UserDrawerProvider>
366+
</TimelineDrawerProvider>
367+
</EditorModalProvider>
368+
</ConcordProvider>
369+
</StorageProvider>
370+
</EmojiPickerProvider>
371+
</AudioPlayerProvider>
370372
</MediaViewerProvider>
371373
</UrlSummaryProvider>
372374
</TickerProvider>
@@ -490,47 +492,46 @@ function App(): JSX.Element {
490492
flex: 1
491493
}}
492494
>
493-
<AudioPlayerProvider>
494-
<Paper
495-
elevation={isDeckPage ? 0 : 3}
496-
sx={{
497-
flexGrow: '1',
498-
margin: { xs: 0.5, sm: 1 },
499-
display: 'flex',
500-
flexFlow: 'column',
501-
borderRadius: isDeckPage ? 0 : 2,
502-
overflow: 'hidden',
503-
background: 'none'
504-
}}
505-
>
506-
<Routes>
507-
<Route index element={<ListPage />} />
508-
<Route path="/:id" element={<EntityPage />} />
509-
<Route path="/intent" element={<ListPage />} />
510-
<Route path="/settings/*" element={<Settings />} />
511-
<Route path="/:id/media" element={<EntityPage />} />
512-
<Route path="/:id/activity" element={<EntityPage />} />
513-
<Route path="/:id/profile/:profileid" element={<EntityPage />} />
514-
<Route path="/:id/profile/:profileid/media" element={<EntityPage />} />
515-
<Route path="/:id/profile/:profileid/activity" element={<EntityPage />} />
516-
<Route path="/:authorID/:messageID" element={<MessagePage />} />
517-
<Route path="/timeline/:id" element={<TimelinePage />} />
518-
<Route path="/contacts" element={<ContactsPage />} />
519-
<Route path="/explorer/:tab" element={<ExplorerPlusPage />} />
520-
<Route path="/classicexplorer/:tab" element={<Explorer />} />
521-
<Route
522-
path="/notifications"
523-
element={<Notifications latestNotification={latestNotificationDate} />}
524-
/>
525-
<Route path="/ap/:id" element={<ApUserPage />} />
526-
<Route path="/devtool" element={<Devtool />} />
527-
<Route path="/subscriptions" element={<ManageSubsPage />} />
528-
<Route path="/concord/*" element={<ConcordPage />} />
529-
<Route path="/tutorial" element={<Tutorial />} />
530-
<Route path="/deck" element={<DeckPage />} />
531-
</Routes>
532-
</Paper>
533-
</AudioPlayerProvider>
495+
<Paper
496+
elevation={isDeckPage ? 0 : 3}
497+
sx={{
498+
flexGrow: '1',
499+
margin: { xs: 0.5, sm: 1 },
500+
display: 'flex',
501+
flexFlow: 'column',
502+
borderRadius: isDeckPage ? 0 : 2,
503+
overflow: 'hidden',
504+
background: 'none'
505+
}}
506+
>
507+
<Routes>
508+
<Route index element={<ListPage />} />
509+
<Route path="/:id" element={<EntityPage />} />
510+
<Route path="/intent" element={<ListPage />} />
511+
<Route path="/settings/*" element={<Settings />} />
512+
<Route path="/:id/media" element={<EntityPage />} />
513+
<Route path="/:id/activity" element={<EntityPage />} />
514+
<Route path="/:id/profile/:profileid" element={<EntityPage />} />
515+
<Route path="/:id/profile/:profileid/media" element={<EntityPage />} />
516+
<Route path="/:id/profile/:profileid/activity" element={<EntityPage />} />
517+
<Route path="/:authorID/:messageID" element={<MessagePage />} />
518+
<Route path="/timeline/:id" element={<TimelinePage />} />
519+
<Route path="/contacts" element={<ContactsPage />} />
520+
<Route path="/explorer/:tab" element={<ExplorerPlusPage />} />
521+
<Route path="/classicexplorer/:tab" element={<Explorer />} />
522+
<Route
523+
path="/notifications"
524+
element={<Notifications latestNotification={latestNotificationDate} />}
525+
/>
526+
<Route path="/ap/:id" element={<ApUserPage />} />
527+
<Route path="/devtool" element={<Devtool />} />
528+
<Route path="/subscriptions" element={<ManageSubsPage />} />
529+
<Route path="/concord/*" element={<ConcordPage />} />
530+
<Route path="/tutorial" element={<Tutorial />} />
531+
<Route path="/deck" element={<DeckPage />} />
532+
</Routes>
533+
</Paper>
534+
<AudioPlayerOutlet />
534535
<Box
535536
sx={{
536537
display: {

0 commit comments

Comments
 (0)