diff --git a/web/apps/photos/src/components/PhotoViewer/index.tsx b/web/apps/photos/src/components/PhotoViewer/index.tsx index ac906b262b..37f84ca94c 100644 --- a/web/apps/photos/src/components/PhotoViewer/index.tsx +++ b/web/apps/photos/src/components/PhotoViewer/index.tsx @@ -141,7 +141,8 @@ export const PhotoViewer: React.FC = ({ collectionNameMap, onSelectPerson, }) => { - const { showLoadingBar, hideLoadingBar } = useContext(AppContext); + const { showLoadingBar, hideLoadingBar, showMiniDialog } = + useContext(AppContext); const galleryContext = useContext(GalleryContext); const publicCollectionGalleryContext = useContext( PublicCollectionGalleryContext, @@ -971,6 +972,7 @@ export const PhotoViewer: React.FC = ({ closePhotoViewer={handleClose} file={photoSwipe?.currItem as EnteFile} exif={exif?.value} + showMiniDialog={showMiniDialog} shouldDisableEdits={!isOwnFile} allowMap={!publicCollectionGalleryContext.credentials} showCollectionChips={ diff --git a/web/packages/gallery/components/FileInfo.tsx b/web/packages/gallery/components/FileInfo.tsx index 8110187692..1119401917 100644 --- a/web/packages/gallery/components/FileInfo.tsx +++ b/web/packages/gallery/components/FileInfo.tsx @@ -1,5 +1,6 @@ +/* eslint-disable @typescript-eslint/no-unnecessary-condition */ +/* eslint-disable @typescript-eslint/no-unused-expressions */ /* TODO: Audit this file */ -/* eslint-disable */ /* @ts-nocheck */ import { LinkButtonUndecorated } from "@/base/components/LinkButton"; @@ -80,10 +81,11 @@ import { } from "@mui/material"; import { Formik } from "formik"; import { t } from "i18next"; -import React, { useContext, useEffect, useMemo, useRef, useState } from "react"; +import React, { useEffect, useMemo, useRef, useState } from "react"; import * as Yup from "yup"; // Re-uses images from ~leaflet package. +import type { AccountsContextT } from "@/accounts/types/context"; import "leaflet-defaulticon-compatibility/dist/leaflet-defaulticon-compatibility.webpack.css"; import "leaflet/dist/leaflet.css"; // eslint-disable-next-line @typescript-eslint/no-require-imports @@ -99,11 +101,19 @@ export interface FileInfoExif { } export interface FileInfoProps { + /** + * The file whose information we are showing. + */ + file: EnteFile | undefined; showInfo: boolean; handleCloseInfo: () => void; closePhotoViewer: () => void; - file: EnteFile | undefined; exif: FileInfoExif | undefined; + /** + * This is the same as the {@link showMiniDialog} prop in the top level + * {@link AppContext} of the app which we're currently being shown in. + */ + showMiniDialog: AccountsContextT["showMiniDialog"]; /** * TODO: Rename and flip to allowEdits. */ @@ -130,11 +140,12 @@ export interface FileInfoProps { } export const FileInfo: React.FC = ({ + file, + showMiniDialog, shouldDisableEdits, allowMap, showInfo, handleCloseInfo, - file, exif, scheduleUpdate, refreshPhotoswipe, @@ -147,8 +158,6 @@ export const FileInfo: React.FC = ({ }) => { const { mapEnabled } = useSettingsSnapshot(); - const { showMiniDialog } = useContext(AppContext); - const [exifInfo, setExifInfo] = useState(); const { show: showRawExif, props: rawExifVisibilityProps } = useModalVisibility();