Software-Mac/spacedrive
Software-Mac/spacedrive
1
0
Fork 0
mirror of https://github.com/spacedriveapp/spacedrive synced 2024-07-04 13:23:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

move cache provider (#1857)

Browse source
This commit is contained in:
Brendan Allan 2023-12-06 08:25:23 +11:00 committed by GitHub
parent 89a7f735e5
commit 3d3e211ffe
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 92 additions and 92 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

168
apps/desktop/src/App.tsx
View file

@ -63,14 +63,16 @@ export default function App() {
<RspcProvider queryClient={queryClient}>
<PlatformProvider platform={platform}>
<QueryClientProvider client={queryClient}>
{startupError ? (
<ErrorPage
message={startupError}
submessage="Error occurred starting up the Spacedrive core"
/>
) : (
<AppInner />
)}
<CacheProvider cache={cache}>
{startupError ? (
<ErrorPage
message={startupError}
submessage="Error occurred starting up the Spacedrive core"
/>
) : (
<AppInner />
)}
</CacheProvider>
</QueryClientProvider>
</PlatformProvider>
</RspcProvider>
@ -144,86 +146,84 @@ function AppInner() {
}, [tab.element]);
return (
<CacheProvider cache={cache}>
<RouteTitleContext.Provider
value={useMemo(
() => ({
setTitle(title) {
setTabs((oldTabs) => {
const tabs = [...oldTabs];
const tab = tabs[tabIndex];
<RouteTitleContext.Provider
value={useMemo(
() => ({
setTitle(title) {
setTabs((oldTabs) => {
const tabs = [...oldTabs];
const tab = tabs[tabIndex];
if (!tab) return tabs;
tabs[tabIndex] = { ...tab, title };
return tabs;
});
}
}),
[tabIndex]
)}
>
<TabsContext.Provider
value={{
tabIndex,
setTabIndex,
tabs: tabs.map(({ router, title }) => ({ router, title })),
createTab() {
createTabPromise.current = createTabPromise.current.then(
() =>
new Promise((res) => {
startTransition(() => {
setTabs((tabs) => {
const newTabs = [...tabs, createTab()];
setTabIndex(newTabs.length - 1);
return newTabs;
});
});
setTimeout(res, TAB_CREATE_DELAY);
})
);
},
removeTab(index: number) {
startTransition(() => {
setTabs((tabs) => {
const tab = tabs[index];
if (!tab) return tabs;
tabs[tabIndex] = { ...tab, title };
tab.dispose();
return tabs;
tabs.splice(index, 1);
setTabIndex(Math.min(tabIndex, tabs.length - 1));
return [...tabs];
});
}
}),
[tabIndex]
)}
});
}
}}
>
<TabsContext.Provider
value={{
tabIndex,
setTabIndex,
tabs: tabs.map(({ router, title }) => ({ router, title })),
createTab() {
createTabPromise.current = createTabPromise.current.then(
() =>
new Promise((res) => {
startTransition(() => {
setTabs((tabs) => {
const newTabs = [...tabs, createTab()];
setTabIndex(newTabs.length - 1);
return newTabs;
});
});
setTimeout(res, TAB_CREATE_DELAY);
})
);
},
removeTab(index: number) {
startTransition(() => {
setTabs((tabs) => {
const tab = tabs[index];
if (!tab) return tabs;
tab.dispose();
tabs.splice(index, 1);
setTabIndex(Math.min(tabIndex, tabs.length - 1));
return [...tabs];
});
});
}
}}
>
<SpacedriveInterfaceRoot>
{tabs.map((tab) =>
createPortal(
<SpacedriveRouterProvider
key={tab.id}
routing={{
routes,
visible: tabIndex === tabs.indexOf(tab),
router: tab.router,
currentIndex: tab.currentIndex,
maxIndex: tab.maxIndex
}}
/>,
tab.element
)
)}
<div ref={ref} />
</SpacedriveInterfaceRoot>
</TabsContext.Provider>
</RouteTitleContext.Provider>
</CacheProvider>
<SpacedriveInterfaceRoot>
{tabs.map((tab) =>
createPortal(
<SpacedriveRouterProvider
key={tab.id}
routing={{
routes,
visible: tabIndex === tabs.indexOf(tab),
router: tab.router,
currentIndex: tab.currentIndex,
maxIndex: tab.maxIndex
}}
/>,
tab.element
)
)}
<div ref={ref} />
</SpacedriveInterfaceRoot>
</TabsContext.Provider>
</RouteTitleContext.Provider>
);
}

16
apps/web/src/App.tsx
View file

@ -104,10 +104,10 @@ function App() {
return (
<ScreenshotWrapper showControls={!!showControls}>
<div ref={domEl} className="App">
<CacheProvider cache={cache}>
<RspcProvider queryClient={queryClient}>
<PlatformProvider platform={platform}>
<QueryClientProvider client={queryClient}>
<RspcProvider queryClient={queryClient}>
<PlatformProvider platform={platform}>
<QueryClientProvider client={queryClient}>
<CacheProvider cache={cache}>
<SpacedriveInterfaceRoot>
<SpacedriveRouterProvider
routing={{
@ -117,10 +117,10 @@ function App() {
}}
/>
</SpacedriveInterfaceRoot>
</QueryClientProvider>
</PlatformProvider>
</RspcProvider>
</CacheProvider>
</CacheProvider>
</QueryClientProvider>
</PlatformProvider>
</RspcProvider>
</div>
</ScreenshotWrapper>
);