Atlas48/grungnet
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into test/1.10.0

Browse Source
This commit is contained in:
Mitchell McCaffrey 2021-07-24 18:04:58 +10:00
commit 97f1294a23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/contexts/AssetsContext.tsx
View File

@ -150,8 +150,7 @@ export function AssetURLsProvider({ children }: { children: React.ReactNode }) {
// Get the new assets whenever the keys change // Get the new assets whenever the keys change
const assets = useLiveQuery<Asset[]>( const assets = useLiveQuery<Asset[]>(
() => () => database?.table("assets").bulkGet(assetKeys) || [],
database?.table("assets").where("id").anyOf(assetKeys).toArray() || [],
[database, assetKeys] [database, assetKeys]
); );
@ -160,13 +159,14 @@ export function AssetURLsProvider({ children }: { children: React.ReactNode }) {
if (!assets || assets.length === 0) { if (!assets || assets.length === 0) {
return; return;
} }
// Assets are about to be loaded so clear the keys to load // Assets are about to be loaded so clear the keys to load
setAssetKeys([]); setAssetKeys([]);
setAssetURLs((prevURLs) => { setAssetURLs((prevURLs) => {
let newURLs = { ...prevURLs }; let newURLs = { ...prevURLs };
for (let asset of assets) { for (let asset of assets) {
if (newURLs[asset.id]?.url === null) { if (asset && newURLs[asset.id]?.url === null) {
newURLs[asset.id] = { newURLs[asset.id] = {
...newURLs[asset.id], ...newURLs[asset.id],
url: URL.createObjectURL( url: URL.createObjectURL(