Skip to content

armgit / ente

Public Imported from GitHub
0

πŸ’š End-to-end encrypted cloud for everything.

fix(photos):scope-folder-path-tooltip-to-title

Aswin Asok348919dfa552
diff --git a/web/apps/photos/src/components/sidebar/WatchFolder.tsx b/web/apps/photos/src/components/sidebar/WatchFolder.tsx
index 40863f6f48..1a493abcfb 100644
--- a/web/apps/photos/src/components/sidebar/WatchFolder.tsx
+++ b/web/apps/photos/src/components/sidebar/WatchFolder.tsx
@@ -315,50 +315,48 @@ const WatchEntry: React.FC<WatchEntryProps> = ({
};
return (
- <Tooltip title={watch.folderPath}>
- <Box>
- <RowCard
- title={`/${watch.folderPath
+ <RowCard
+ title={
+ <Tooltip title={watch.folderPath}>
+ <span>{`/${watch.folderPath
.split(/[\\/]/)
.filter(Boolean)
.slice(-2)
- .join("/")}`}
- subtitle={
- !isAccessible ? t("folder_not_accessible") : undefined
- }
- endIcon={
- <Stack
- direction="row"
- sx={{ alignItems: "center", flexShrink: 0 }}
+ .join("/")}`}</span>
+ </Tooltip>
+ }
+ subtitle={!isAccessible ? t("folder_not_accessible") : undefined}
+ endIcon={
+ <Stack
+ direction="row"
+ sx={{ alignItems: "center", flexShrink: 0 }}
+ >
+ {!isAccessible && (
+ <Tooltip title={t("retry_watching")}>
+ <IconButton
+ aria-label={`${t("retry_watching")}: ${watch.folderPath}`}
+ onClick={handleRetry}
+ disabled={isRetrying}
+ >
+ {isRetrying ? (
+ <CircularProgress size={20} />
+ ) : (
+ <RefreshIcon />
+ )}
+ </IconButton>
+ </Tooltip>
+ )}
+ <Tooltip title={t("stop_watching")}>
+ <IconButton
+ aria-label={`${t("stop_watching")}: ${watch.folderPath}`}
+ onClick={confirmStopWatching}
>
- {!isAccessible && (
- <Tooltip title={t("retry_watching")}>
- <IconButton
- aria-label={`${t("retry_watching")}: ${watch.folderPath}`}
- onClick={handleRetry}
- disabled={isRetrying}
- >
- {isRetrying ? (
- <CircularProgress size={20} />
- ) : (
- <RefreshIcon />
- )}
- </IconButton>
- </Tooltip>
- )}
- <Tooltip title={t("stop_watching")}>
- <IconButton
- aria-label={`${t("stop_watching")}: ${watch.folderPath}`}
- onClick={confirmStopWatching}
- >
- <StopCircleOutlinedIcon />
- </IconButton>
- </Tooltip>
- </Stack>
- }
- />
- </Box>
- </Tooltip>
+ <StopCircleOutlinedIcon />
+ </IconButton>
+ </Tooltip>
+ </Stack>
+ }
+ />
);
};
diff --git a/web/packages/base/components/v2/RowCard.tsx b/web/packages/base/components/v2/RowCard.tsx
index e0a3198bcc..54b145f88c 100644
--- a/web/packages/base/components/v2/RowCard.tsx
+++ b/web/packages/base/components/v2/RowCard.tsx
@@ -4,7 +4,7 @@ import { FocusVisibleButton } from "ente-base/components/mui/FocusVisibleButton"
import React from "react";
interface RowCardProps {
- title: string;
+ title: React.ReactNode;
subtitle?: string;
onClick?: () => void;
endIcon?: React.ReactNode;