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