Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(web): lazy load photo sphere viewer #7057

Merged
merged 2 commits into from
Feb 12, 2024
Merged

feat(web): lazy load photo sphere viewer #7057

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2937600
feat: lazy load photo sphere viewer
benmccann Feb 12, 2024
987c914
destructure
benmccann Feb 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 14 additions & 25 deletions web/src/lib/components/asset-viewer/panorama-viewer.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,40 +2,29 @@
import { fade } from 'svelte/transition';
import LoadingSpinner from '../shared-components/loading-spinner.svelte';
import { api, type AssetResponseDto } from '@api';
import PhotoSphere from './photo-sphere-viewer-adapter.svelte';

export let asset: AssetResponseDto;

let dataUrl = '';
let errorMessage = '';

const loadAssetData = async () => {
try {
const { data } = await api.assetApi.serveFile(
{ id: asset.id, isThumb: false, isWeb: false, key: api.getKey() },
{ responseType: 'blob' },
);
if (data instanceof Blob) {
dataUrl = URL.createObjectURL(data);
return dataUrl;
} else {
throw new TypeError('Invalid data format');
}
} catch {
errorMessage = 'Failed to load asset';
return '';
const { data } = await api.assetApi.serveFile(
{ id: asset.id, isThumb: false, isWeb: false, key: api.getKey() },
{ responseType: 'blob' },
);
if (data instanceof Blob) {
return URL.createObjectURL(data);
} else {
throw new TypeError('Invalid data format');
}
};
</script>

<div transition:fade={{ duration: 150 }} class="flex h-full select-none place-content-center place-items-center">
{#await loadAssetData()}
<!-- the photo sphere viewer is quite large, so lazy load it in parallel with loading the data -->
{#await Promise.all([loadAssetData(), import('./photo-sphere-viewer-adapter.svelte')])}
<LoadingSpinner />
{:then assetData}
{#if assetData}
<PhotoSphere panorama={assetData} />
{:else}
<p>{errorMessage}</p>
{/if}
{:then [data, module]}
<svelte:component this={module.default} panorama={data} />
{:catch}
Failed to load asset
{/await}
</div>
Loading