move setDerivativeState to seperate useEffect
This commit is contained in:
parent
9a01ba91d6
commit
d7f40dcaf4
|
@ -43,7 +43,7 @@ export default function Collections(props: Iprops) {
|
||||||
collectionsMap.current.get(activeCollectionID);
|
collectionsMap.current.get(activeCollectionID);
|
||||||
}, [activeCollectionID, collections]);
|
}, [activeCollectionID, collections]);
|
||||||
|
|
||||||
if (isInSearchMode || !collections?.length) {
|
if (isInSearchMode || collectionSummaries?.size <= 3) {
|
||||||
return <></>;
|
return <></>;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -240,7 +240,6 @@ export default function Gallery() {
|
||||||
setFiles(sortFiles(files));
|
setFiles(sortFiles(files));
|
||||||
setCollections(collections);
|
setCollections(collections);
|
||||||
setTrash(trash);
|
setTrash(trash);
|
||||||
await setDerivativeState(collections, files);
|
|
||||||
await syncWithRemote(true);
|
await syncWithRemote(true);
|
||||||
setIsFirstLoad(false);
|
setIsFirstLoad(false);
|
||||||
setJustSignedUp(false);
|
setJustSignedUp(false);
|
||||||
|
@ -249,6 +248,10 @@ export default function Gallery() {
|
||||||
main();
|
main();
|
||||||
}, []);
|
}, []);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
setDerivativeState(collections, files);
|
||||||
|
}, [collections, files]);
|
||||||
|
|
||||||
useEffect(
|
useEffect(
|
||||||
() => collectionSelectorAttributes && setCollectionSelectorView(true),
|
() => collectionSelectorAttributes && setCollectionSelectorView(true),
|
||||||
[collectionSelectorAttributes]
|
[collectionSelectorAttributes]
|
||||||
|
@ -319,7 +322,6 @@ export default function Gallery() {
|
||||||
const trash = await syncTrash(collections, setFiles, files);
|
const trash = await syncTrash(collections, setFiles, files);
|
||||||
setTrash(trash);
|
setTrash(trash);
|
||||||
files.push(...getTrashedFiles(trash));
|
files.push(...getTrashedFiles(trash));
|
||||||
await setDerivativeState(collections, files);
|
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
logError(e, 'syncWithRemote failed');
|
logError(e, 'syncWithRemote failed');
|
||||||
switch (e.message) {
|
switch (e.message) {
|
||||||
|
@ -345,6 +347,7 @@ export default function Gallery() {
|
||||||
collections: Collection[],
|
collections: Collection[],
|
||||||
files: EnteFile[]
|
files: EnteFile[]
|
||||||
) => {
|
) => {
|
||||||
|
files = files || [];
|
||||||
const favItemIds = await getFavItemIds(files);
|
const favItemIds = await getFavItemIds(files);
|
||||||
setFavItemIds(favItemIds);
|
setFavItemIds(favItemIds);
|
||||||
const nonEmptyCollections = getNonEmptyCollections(collections, files);
|
const nonEmptyCollections = getNonEmptyCollections(collections, files);
|
||||||
|
|
Loading…
Reference in a new issue