beenull/ente
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

fix first load loading

Browse source
This commit is contained in:
Abhinav 2022-01-29 08:59:47 +05:30
parent 14516bb252
commit ac8ef83fcf
1 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/pages/shared-albums/index.tsx
View file

@ -32,7 +32,7 @@ export default function PublicCollectionGallery() {
const token = useRef<string>(null);
const collectionKey = useRef<string>(null);
const url = useRef<string>(null);
const [publicFiles, setPublicFiles] = useState<EnteFile[]>(null);
const [publicFiles, setPublicFiles] = useState<EnteFile[]>([]);
const [publicCollection, setPublicCollection] = useState<Collection>(null);
const appContext = useContext(AppContext);
const [abuseReportFormView, setAbuseReportFormView] = useState(false);
@ -42,14 +42,23 @@ export default function PublicCollectionGallery() {
const openReportForm = () => setAbuseReportFormView(true);
const closeReportForm = () => setAbuseReportFormView(false);
const loadingBar = useRef(null);
const [isLoadingBarRunning, setIsLoadingBarRunning] = useState(false);
const openMessageDialog = () => setMessageDialogView(true);
const closeMessageDialog = () => setMessageDialogView(false);
const startLoading = () => loadingBar.current?.continuousStart();
const finishLoading = () => loadingBar.current?.complete();
const startLoading = () => {
!isLoadingBarRunning && loadingBar.current?.continuousStart();
setIsLoadingBarRunning(true);
};
const finishLoading = () => {
loadingBar.current?.complete();
setIsLoadingBarRunning(false);
};
useEffect(() => {
appContext.showNavBar(true);
setLoading(false);
const currentURL = new URL(window.location.href);
if (currentURL.pathname !== PAGES.ROOT) {
router.push(
@ -88,10 +97,8 @@ export default function PublicCollectionGallery() {
mergeMetadata(await getLocalPublicFiles(localCollection))
);
setPublicFiles(localPublicFiles);
setLoading(false);
}
syncWithRemote();
appContext.showNavBar(true);
};
main();
}, []);
@ -117,7 +124,6 @@ export default function PublicCollectionGallery() {
setPublicFiles(null);
}
} finally {
setLoading(false);
finishLoading();
}
};
@ -130,7 +136,7 @@ export default function PublicCollectionGallery() {
</Container>
);
}
if (!publicFiles) {
if (!isLoadingBarRunning && !publicFiles) {
return <Container>{constants.NOT_FOUND}</Container>;
}
return (