kenmirrors/ente
1
0
Fork 0
mirror of https://github.com/ente-io/ente.git synced 2025-08-10 16:32:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Reorder

Browse Source
This commit is contained in:
Manav Rathi 2025-02-06 13:20:12 +05:30
parent 54611ff256
commit cdf9474788
No known key found for this signature in database
2 changed files with 41 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
web/apps/photos/src/components/pages/gallery/SelectedFileOptions.tsx
View File

@ -1,4 +1,4 @@
import { SelectionBar } from "@/base/components/Navbar"; import { NavbarBaseNormalFlow, SelectionBar } from "@/base/components/Navbar";
import type { Collection } from "@/media/collection"; import type { Collection } from "@/media/collection";
import type { CollectionSelectorAttributes } from "@/new/photos/components/CollectionSelector"; import type { CollectionSelectorAttributes } from "@/new/photos/components/CollectionSelector";
import type { GalleryBarMode } from "@/new/photos/components/gallery/reducer"; import type { GalleryBarMode } from "@/new/photos/components/gallery/reducer";
@ -174,7 +174,7 @@ const SelectedFileOptions = ({
}; };
return ( return (
<SelectionBar> <NavbarBaseNormalFlow>
<FluidContainer> <FluidContainer>
<IconButton onClick={clearSelection}> <IconButton onClick={clearSelection}>
<CloseIcon /> <CloseIcon />
@ -417,7 +417,7 @@ const SelectedFileOptions = ({
</> </>
)} )}
</Stack> </Stack>
</SelectionBar> </NavbarBaseNormalFlow>
); );
}; };

76
web/apps/photos/src/pages/gallery.tsx
View File

@ -969,6 +969,44 @@ const Page: React.FC = () => {
/> />
)} )}
</NavbarBaseNormalFlow> </NavbarBaseNormalFlow>
{selected.count > 0 &&
selected.collectionID === activeCollectionID && (
<SelectedFileOptions
handleCollectionOps={collectionOpsHelper}
handleFileOps={fileOpsHelper}
showCreateCollectionModal={
showCreateCollectionModal
}
onOpenCollectionSelector={
handleOpenCollectionSelector
}
count={selected.count}
ownCount={selected.ownCount}
clearSelection={clearSelection}
barMode={barMode}
activeCollectionID={activeCollectionID}
selectedCollection={getSelectedCollection(
selected.collectionID,
collections,
)}
isFavoriteCollection={
collectionSummaries.get(activeCollectionID)
?.type == "favorites"
}
isUncategorizedCollection={
collectionSummaries.get(activeCollectionID)
?.type == "uncategorized"
}
isIncomingSharedCollection={
collectionSummaries.get(activeCollectionID)
?.type == "incomingShareCollaborator" ||
collectionSummaries.get(activeCollectionID)
?.type == "incomingShareViewer"
}
isInSearchMode={isInSearchMode}
isInHiddenSection={barMode == "hidden-albums"}
/>
)}
{isOffline && <OfflineMessage />} {isOffline && <OfflineMessage />}
<GalleryBarAndListHeader <GalleryBarAndListHeader
@ -1085,44 +1123,6 @@ const Page: React.FC = () => {
}} }}
/> />
)} )}
{selected.count > 0 &&
selected.collectionID === activeCollectionID && (
<SelectedFileOptions
handleCollectionOps={collectionOpsHelper}
handleFileOps={fileOpsHelper}
showCreateCollectionModal={
showCreateCollectionModal
}
onOpenCollectionSelector={
handleOpenCollectionSelector
}
count={selected.count}
ownCount={selected.ownCount}
clearSelection={clearSelection}
barMode={barMode}
activeCollectionID={activeCollectionID}
selectedCollection={getSelectedCollection(
selected.collectionID,
collections,
)}
isFavoriteCollection={
collectionSummaries.get(activeCollectionID)
?.type == "favorites"
}
isUncategorizedCollection={
collectionSummaries.get(activeCollectionID)
?.type == "uncategorized"
}
isIncomingSharedCollection={
collectionSummaries.get(activeCollectionID)
?.type == "incomingShareCollaborator" ||
collectionSummaries.get(activeCollectionID)
?.type == "incomingShareViewer"
}
isInSearchMode={isInSearchMode}
isInHiddenSection={barMode == "hidden-albums"}
/>
)}
<Export <Export
{...exportVisibilityProps} {...exportVisibilityProps}
collectionNameMap={state.allCollectionNameByID} collectionNameMap={state.allCollectionNameByID}