From 4791b10d916b06318051541926ba1e91bfdb2924 Mon Sep 17 00:00:00 2001 From: Manav Rathi Date: Tue, 24 Sep 2024 12:21:16 +0530 Subject: [PATCH] rename --- .../Collections/CollectionListHeader.tsx | 25 ++++++++----------- .../src/components/Collections/index.tsx | 12 ++++----- 2 files changed, 16 insertions(+), 21 deletions(-) diff --git a/web/apps/photos/src/components/Collections/CollectionListHeader.tsx b/web/apps/photos/src/components/Collections/CollectionListHeader.tsx index c1cd09a781..58065aaddc 100644 --- a/web/apps/photos/src/components/Collections/CollectionListHeader.tsx +++ b/web/apps/photos/src/components/Collections/CollectionListHeader.tsx @@ -40,8 +40,7 @@ import { UnPinIcon } from "components/icons/UnPinIcon"; import { t } from "i18next"; import { AppContext } from "pages/_app"; import { GalleryContext } from "pages/gallery"; -import type { Dispatch, SetStateAction } from "react"; -import { useCallback, useContext, useRef, useState } from "react"; +import React, { useCallback, useContext, useRef, useState } from "react"; import { Trans } from "react-i18next"; import * as CollectionAPI from "services/collectionService"; import * as TrashService from "services/trashService"; @@ -62,11 +61,11 @@ interface CollectionListHeaderProps { collectionSummary: CollectionSummary; activeCollection: Collection; setActiveCollectionID: (collectionID: number) => void; - setCollectionNamerAttributes: SetCollectionNamerAttributes; - showCollectionShareModal: () => void; - setFilesDownloadProgressAttributesCreator: SetFilesDownloadProgressAttributesCreator; isActiveCollectionDownloadInProgress: () => boolean; - setShowAlbumCastDialog: Dispatch>; + onCollectionShare: () => void; + onCollectionCast: () => void; + setCollectionNamerAttributes: SetCollectionNamerAttributes; + setFilesDownloadProgressAttributesCreator: SetFilesDownloadProgressAttributesCreator; } export const CollectionListHeader: React.FC = ({ @@ -128,11 +127,11 @@ const CollectionOptions: React.FC = ({ activeCollection, collectionSummaryType, setActiveCollectionID, + onCollectionShare, + onCollectionCast, setCollectionNamerAttributes, - showCollectionShareModal, setFilesDownloadProgressAttributesCreator, isActiveCollectionDownloadInProgress, - setShowAlbumCastDialog, }) => { const { startLoading, finishLoading, setDialogMessage } = useContext(AppContext); @@ -302,8 +301,6 @@ const CollectionOptions: React.FC = ({ setActiveCollectionID(ALL_SECTION); }); - const showCastAlbumDialog = () => setShowAlbumCastDialog(true); - const pinAlbum = wrap(() => changeCollectionOrder(activeCollection, 1)); const unpinAlbum = wrap(() => changeCollectionOrder(activeCollection, 0)); @@ -343,7 +340,7 @@ const CollectionOptions: React.FC = ({ isDownloadInProgress={isActiveCollectionDownloadInProgress} onEmptyTrashClick={confirmEmptyTrash} onDownloadClick={downloadCollection} - onShareClick={showCollectionShareModal} + onShareClick={onCollectionShare} /> = ({ onArchiveClick={archiveAlbum} onUnarchiveClick={unarchiveAlbum} onLeaveSharedAlbumClick={confirmLeaveSharedAlbum} - onCastClick={showCastAlbumDialog} + onCastClick={onCollectionCast} /> ) : ( = ({ onHideClick={hideAlbum} onUnhideClick={unhideAlbum} onDeleteClick={confirmDeleteCollection} - onShareClick={showCollectionShareModal} - onCastClick={showCastAlbumDialog} + onShareClick={onCollectionShare} + onCastClick={onCollectionCast} /> )} diff --git a/web/apps/photos/src/components/Collections/index.tsx b/web/apps/photos/src/components/Collections/index.tsx index 223bb20756..0b003cdd19 100644 --- a/web/apps/photos/src/components/Collections/index.tsx +++ b/web/apps/photos/src/components/Collections/index.tsx @@ -127,9 +127,6 @@ export const Collections: React.FC = ({ setPhotoListHeader({ item: ( = ({ setFilesDownloadProgressAttributesCreator, isActiveCollectionDownloadInProgress, }} - showCollectionShareModal={() => - setOpenCollectionShareView(true) - } - setShowAlbumCastDialog={setOpenAlbumCastDialog} + collectionSummary={toShowCollectionSummaries.get( + activeCollectionID, + )} + onCollectionShare={() => setOpenCollectionShareView(true)} + onCollectionCast={() => setOpenAlbumCastDialog(true)} /> ), itemType: ITEM_TYPE.HEADER,