Skip to content

armgit / ente

Public Imported from GitHub
0

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

[web] Reuse shared island notifications

AswinAsok2da4130ef918
diff --git a/web/apps/albums/src/public-album/components/TripLayout/MobileNavBar.tsx b/web/apps/albums/src/public-album/components/TripLayout/MobileNavBar.tsx
index 8e6e0aba3a..30bce3cd0e 100644
--- a/web/apps/albums/src/public-album/components/TripLayout/MobileNavBar.tsx
+++ b/web/apps/albums/src/public-album/components/TripLayout/MobileNavBar.tsx
@@ -6,7 +6,8 @@ import {
FeedIcon,
ShareIcon,
} from "@/public-album/components/ActionIcons";
-import CheckIcon from "@mui/icons-material/Check";
+import { Tick02Icon } from "@hugeicons/core-free-icons";
+import { HugeiconsIcon } from "@hugeicons/react";
import { Box, Button, IconButton, styled } from "@mui/material";
import { EnteLogo } from "ente-base/components/EnteLogo";
import { t } from "i18next";
@@ -104,7 +105,13 @@ export const MobileNavBar: React.FC<MobileNavBarProps> = ({
horizontal="left"
attributes={{
color: "secondary",
- startIcon: <CheckIcon />,
+ startIcon: (
+ <HugeiconsIcon
+ icon={Tick02Icon}
+ size={24}
+ strokeWidth={1.8}
+ />
+ ),
title: "Copied!",
}}
/>
diff --git a/web/apps/albums/src/public-album/components/TripLayout/TopNavButtons.tsx b/web/apps/albums/src/public-album/components/TripLayout/TopNavButtons.tsx
index 7a4ab45afe..aac7e7cefd 100644
--- a/web/apps/albums/src/public-album/components/TripLayout/TopNavButtons.tsx
+++ b/web/apps/albums/src/public-album/components/TripLayout/TopNavButtons.tsx
@@ -6,7 +6,8 @@ import {
FeedIcon,
ShareIcon,
} from "@/public-album/components/ActionIcons";
-import CheckIcon from "@mui/icons-material/Check";
+import { Tick02Icon } from "@hugeicons/core-free-icons";
+import { HugeiconsIcon } from "@hugeicons/react";
import { Box, Button, IconButton, styled } from "@mui/material";
import { t } from "i18next";
import { useState } from "react";
@@ -79,7 +80,13 @@ export const TopNavButtons: React.FC<TopNavButtonsProps> = ({
horizontal="left"
attributes={{
color: "secondary",
- startIcon: <CheckIcon />,
+ startIcon: (
+ <HugeiconsIcon
+ icon={Tick02Icon}
+ size={24}
+ strokeWidth={1.8}
+ />
+ ),
title: "Copied!",
}}
/>
diff --git a/web/apps/albums/src/public-album/page/PublicAlbumPage.tsx b/web/apps/albums/src/public-album/page/PublicAlbumPage.tsx
index b261c71756..5ad9214e38 100644
--- a/web/apps/albums/src/public-album/page/PublicAlbumPage.tsx
+++ b/web/apps/albums/src/public-album/page/PublicAlbumPage.tsx
@@ -28,7 +28,8 @@ import type { FileViewerInitialSidebar } from "@/public-album/viewer/components/
import type { PublicAlbumSingleFileViewerProps } from "@/public-album/viewer/components/PublicAlbumSingleFileViewer";
import type { PublicFeedItemClickInfo } from "@/public-album/viewer/components/PublicFeedSidebar";
import { LazyPublicFeedSidebar } from "@/public-album/viewer/lib/lazy";
-import CheckIcon from "@mui/icons-material/Check";
+import { Tick02Icon } from "@hugeicons/core-free-icons";
+import { HugeiconsIcon } from "@hugeicons/react";
import CloseIcon from "@mui/icons-material/Close";
import {
Box,
@@ -1301,7 +1302,13 @@ const FileListHeader: React.FC<FileListHeaderProps> = ({
horizontal="left"
attributes={{
color: "secondary",
- startIcon: <CheckIcon />,
+ startIcon: (
+ <HugeiconsIcon
+ icon={Tick02Icon}
+ size={24}
+ strokeWidth={1.8}
+ />
+ ),
title: "Copied!",
}}
/>
diff --git a/web/apps/albums/src/public-album/viewer/components/PublicAlbumSingleFileViewer.tsx b/web/apps/albums/src/public-album/viewer/components/PublicAlbumSingleFileViewer.tsx
index 68d66d5574..a65a879759 100644
--- a/web/apps/albums/src/public-album/viewer/components/PublicAlbumSingleFileViewer.tsx
+++ b/web/apps/albums/src/public-album/viewer/components/PublicAlbumSingleFileViewer.tsx
@@ -1,7 +1,8 @@
import { LazyNotification } from "@/app/lazy/global-ui";
import { getEnteURL } from "@/public-album/access/utils/external-links";
import { downloadManager } from "@/public-album/download/services/download-manager";
-import CheckIcon from "@mui/icons-material/Check";
+import { Tick02Icon } from "@hugeicons/core-free-icons";
+import { HugeiconsIcon } from "@hugeicons/react";
import ContentCopyIcon from "@mui/icons-material/ContentCopy";
import DownloadOutlinedIcon from "@mui/icons-material/DownloadOutlined";
import ErrorOutlinedIcon from "@mui/icons-material/ErrorOutlined";
@@ -864,7 +865,13 @@ export const PublicAlbumSingleFileViewer: React.FC<
horizontal="left"
attributes={{
color: "secondary",
- startIcon: <CheckIcon />,
+ startIcon: (
+ <HugeiconsIcon
+ icon={Tick02Icon}
+ size={24}
+ strokeWidth={1.8}
+ />
+ ),
title: "Copied!",
}}
/>
diff --git a/web/apps/ensu/src/components/chat/ChatDialogs.tsx b/web/apps/ensu/src/components/chat/ChatDialogs.tsx
index 70ed108e67..c4faf87c72 100644
--- a/web/apps/ensu/src/components/chat/ChatDialogs.tsx
+++ b/web/apps/ensu/src/components/chat/ChatDialogs.tsx
@@ -1745,8 +1745,9 @@ export const ChatDialogs = memo(
maxWidth: "min(360px, 100vw)",
backgroundColor: "transparent",
boxShadow: "none",
+ border: "none",
bottom: { xs: 96, md: 24 },
- "& .MuiButtonBase-root": {
+ "& > .MuiPaper-root": {
padding: "4px 8px",
borderRadius: "999px",
minHeight: 0,
@@ -1754,13 +1755,20 @@ export const ChatDialogs = memo(
color: "text.base",
boxShadow: "none",
},
+ "& .MuiButtonBase-root": { padding: 0, minHeight: 0 },
"& .MuiStack-root": { gap: 1 },
- "& .MuiStack-root svg": { fontSize: "18px" },
+ "& .MuiStack-root svg": {
+ width: 18,
+ height: 18,
+ fontSize: "18px",
+ },
"& .MuiTypography-root": {
fontSize: "13px",
lineHeight: "18px",
},
"& .MuiIconButton-root": {
+ width: 28,
+ height: 28,
padding: 0,
bgcolor: "transparent",
},
diff --git a/web/apps/photos/src/components/AlbumAddedNotification.tsx b/web/apps/photos/src/components/AlbumAddedNotification.tsx
index 268f15fa9c..17080e320b 100644
--- a/web/apps/photos/src/components/AlbumAddedNotification.tsx
+++ b/web/apps/photos/src/components/AlbumAddedNotification.tsx
@@ -1,13 +1,4 @@
-import { Cancel01Icon } from "@hugeicons/core-free-icons";
-import { HugeiconsIcon } from "@hugeicons/react";
-import {
- DialogTitle,
- IconButton,
- Paper,
- Snackbar,
- Stack,
- Typography,
-} from "@mui/material";
+import { Notification } from "ente-base/components/Notification";
import { t } from "i18next";
import React from "react";
@@ -29,99 +20,16 @@ export const AlbumAddedNotification: React.FC<AlbumAddedNotificationProps> = ({
const shouldShow = open && phase === "done";
return (
- <Snackbar
+ <Notification
open={shouldShow}
- anchorOrigin={{ horizontal: "right", vertical: "bottom" }}
- sx={{
- bottom: { xs: 16, sm: 24 },
- right: { xs: 16, sm: 24 },
- left: { xs: 16, sm: "auto" },
+ onClose={onClose}
+ keepOpenOnClick
+ attributes={{
+ color: "inherit",
+ startIcon: null,
+ title: t("added_to_album"),
+ caption: albumName,
}}
- >
- <Paper
- sx={(theme) => ({
- width: "min(340px, calc(100svw - 32px))",
- borderRadius: "24px",
- border: "1px solid",
- borderColor: "rgba(0, 0, 0, 0.06)",
- backgroundImage: "none",
- boxShadow: "0 8px 32px rgba(0, 0, 0, 0.24)",
- ...theme.applyStyles("dark", {
- borderColor: "rgba(255, 255, 255, 0.06)",
- }),
- })}
- >
- <DialogTitle sx={{ px: 2.5, py: 2 }}>
- <Stack
- direction="row"
- sx={{
- alignItems: "center",
- justifyContent: "space-between",
- gap: 2,
- }}
- >
- <Stack
- role="status"
- sx={{ flex: 1, minWidth: 0, gap: 0.5 }}
- >
- <Typography
- variant="h3"
- sx={{
- fontFamily: '"Outfit Variable", sans-serif',
- fontSize: 18,
- lineHeight: "24px",
- }}
- >
- {t("added_to_album")}
- </Typography>
- {albumName && (
- <Typography
- variant="body"
- noWrap
- title={albumName}
- sx={{
- fontFamily:
- '"Outfit Variable", sans-serif',
- fontWeight: "regular",
- fontSize: 14,
- lineHeight: "20px",
- color: "text.muted",
- }}
- >
- {albumName}
- </Typography>
- )}
- </Stack>
- <IconButton
- onClick={onClose}
- aria-label={t("close")}
- sx={{
- width: 38,
- height: 38,
- flexShrink: 0,
- borderRadius: "50%",
- color: "text.muted",
- bgcolor: "fill.fainter",
- "&:hover": {
- bgcolor: "fill.faintHover",
- color: "text.base",
- },
- "&.Mui-focusVisible": {
- outline: "1px solid",
- outlineColor: "stroke.base",
- outlineOffset: 2,
- },
- }}
- >
- <HugeiconsIcon
- icon={Cancel01Icon}
- size={22}
- strokeWidth={1.8}
- />
- </IconButton>
- </Stack>
- </DialogTitle>
- </Paper>
- </Snackbar>
+ />
);
};
diff --git a/web/apps/photos/src/components/QuickLinkCreatedNotification.tsx b/web/apps/photos/src/components/QuickLinkCreatedNotification.tsx
index 9d7544a37d..eb28118726 100644
--- a/web/apps/photos/src/components/QuickLinkCreatedNotification.tsx
+++ b/web/apps/photos/src/components/QuickLinkCreatedNotification.tsx
@@ -1,8 +1,7 @@
-import CheckIcon from "@mui/icons-material/Check";
-import CloseIcon from "@mui/icons-material/Close";
-import ContentCopyOutlinedIcon from "@mui/icons-material/ContentCopyOutlined";
-import { DialogTitle, Paper, Snackbar, Stack, Typography } from "@mui/material";
-import { FilledIconButton } from "ente-base/components/mui";
+import { Copy01Icon, Tick02Icon } from "@hugeicons/core-free-icons";
+import { HugeiconsIcon } from "@hugeicons/react";
+import { Box } from "@mui/material";
+import { Notification } from "ente-base/components/Notification";
import { t } from "i18next";
import React, { useEffect, useRef, useState } from "react";
@@ -52,43 +51,33 @@ export const QuickLinkCreatedNotification: React.FC<
};
return (
- <Snackbar
+ <Notification
open={open}
- anchorOrigin={{ horizontal: "right", vertical: "bottom" }}
- >
- <Paper sx={{ width: "min(360px, 100svw)" }}>
- <DialogTitle>
- <Stack
- direction="row"
- sx={{
- justifyContent: "space-between",
- alignItems: "center",
- }}
- >
- <Typography variant="h3">
- {t("link_created")}
- </Typography>
- <Stack direction="row" sx={{ gap: 1 }}>
- <FilledIconButton
- aria-label={t("copy_link")}
- onClick={handleCopy}
- >
- {copied ? (
- <CheckIcon sx={{ color: "success.main" }} />
- ) : (
- <ContentCopyOutlinedIcon />
- )}
- </FilledIconButton>
- <FilledIconButton
- aria-label={t("close")}
- onClick={onClose}
- >
- <CloseIcon />
- </FilledIconButton>
- </Stack>
- </Stack>
- </DialogTitle>
- </Paper>
- </Snackbar>
+ onClose={onClose}
+ keepOpenOnClick
+ attributes={{
+ color: "inherit",
+ startIcon: null,
+ title: t("link_created"),
+ endIcon: copied ? (
+ <Box sx={{ color: "success.main", display: "flex" }}>
+ <HugeiconsIcon
+ icon={Tick02Icon}
+ size={22}
+ strokeWidth={1.8}
+ />
+ </Box>
+ ) : (
+ <HugeiconsIcon
+ icon={Copy01Icon}
+ size={18}
+ strokeWidth={1.8}
+ />
+ ),
+ endIconLabel: t("copy_link"),
+ onEndIconClick: handleCopy,
+ showCloseButtonWithEndIcon: true,
+ }}
+ />
);
};
diff --git a/web/apps/photos/src/components/Upload.tsx b/web/apps/photos/src/components/Upload.tsx
index b7501cd2a4..2bd66c287f 100644
--- a/web/apps/photos/src/components/Upload.tsx
+++ b/web/apps/photos/src/components/Upload.tsx
@@ -21,7 +21,8 @@ import {
uploadManager,
} from "@/services/upload-manager";
import watcher from "@/services/watch";
-import DiscFullIcon from "@mui/icons-material/DiscFull";
+import { Database02Icon } from "@hugeicons/core-free-icons";
+import { HugeiconsIcon } from "@hugeicons/react";
import { Dialog, type DialogProps } from "@mui/material";
import type { LocalUser } from "ente-accounts/services/user";
import { isDesktop } from "ente-base/app";
@@ -1129,7 +1130,13 @@ export const Upload: React.FC<UploadProps> = ({
caption: t("storage_quota_exceeded"),
title: t("upgrade_now"),
onClick: onShowPlanSelector,
- startIcon: <DiscFullIcon />,
+ startIcon: (
+ <HugeiconsIcon
+ icon={Database02Icon}
+ size={24}
+ strokeWidth={1.8}
+ />
+ ),
});
break;
default:
diff --git a/web/apps/photos/src/pages/_app.tsx b/web/apps/photos/src/pages/_app.tsx
index ceb5bdd1a0..0eca552665 100644
--- a/web/apps/photos/src/pages/_app.tsx
+++ b/web/apps/photos/src/pages/_app.tsx
@@ -15,7 +15,8 @@ import { photosLogout } from "@/services/logout";
import { runMigrations } from "@/services/migration";
import "@fontsource-variable/inter";
import "@fontsource-variable/outfit";
-import ArrowForwardIcon from "@mui/icons-material/ArrowForward";
+import { ArrowRight02Icon } from "@hugeicons/core-free-icons";
+import { HugeiconsIcon } from "@hugeicons/react";
import { CssBaseline, Typography } from "@mui/material";
import { styled, ThemeProvider, useColorScheme } from "@mui/material/styles";
import { AuthPageProvider } from "ente-accounts/components/auth/AuthPageProvider";
@@ -122,7 +123,13 @@ const App: React.FC<PhotosAppProps> = ({ Component, pageProps }) => {
showNotification({
color: "secondary",
title: t("update_available"),
- endIcon: <ArrowForwardIcon />,
+ endIcon: (
+ <HugeiconsIcon
+ icon={ArrowRight02Icon}
+ size={24}
+ strokeWidth={1.8}
+ />
+ ),
onClick: () =>
showMiniDialog(
updateAvailableForDownloadDialogAttributes(update),
diff --git a/web/apps/photos/src/pages/gallery.tsx b/web/apps/photos/src/pages/gallery.tsx
index b37ce17b40..5017091363 100644
--- a/web/apps/photos/src/pages/gallery.tsx
+++ b/web/apps/photos/src/pages/gallery.tsx
@@ -69,7 +69,8 @@ import {
import { externalLink } from "@/utils/link";
import { sortPeople, type PeopleSortBy } from "@/utils/people-sort";
import { visibleQuickLinks } from "@/utils/quick-links";
-import CheckCircleIcon from "@mui/icons-material/CheckCircle";
+import { CheckmarkCircle02Icon } from "@hugeicons/core-free-icons";
+import { HugeiconsIcon } from "@hugeicons/react";
import { Typography } from "@mui/material";
import { sessionExpiredDialogAttributes } from "ente-accounts/components/utils/dialog";
import {
@@ -1455,7 +1456,13 @@ const Page: React.FC = () => {
)?.name;
showNotification({
color: "secondary",
- startIcon: <CheckCircleIcon />,
+ startIcon: (
+ <HugeiconsIcon
+ icon={CheckmarkCircle02Icon}
+ size={24}
+ strokeWidth={1.8}
+ />
+ ),
title: t("added_to_person"),
caption: personName,
});
diff --git a/web/package-lock.json b/web/package-lock.json
index 0061f27d0f..d172f54b5c 100644
--- a/web/package-lock.json
+++ b/web/package-lock.json
@@ -11944,6 +11944,9 @@
"@emotion/react": "11.14.0",
"@emotion/styled": "11.14.1",
"@fontsource-variable/inter": "5.3.0",
+ "@fontsource-variable/outfit": "5.3.0",
+ "@hugeicons/core-free-icons": "4.3.5",
+ "@hugeicons/react": "1.1.10",
"@mui/icons-material": "9.4.0",
"@mui/material": "9.4.0",
"comlink": "4.4.2",
diff --git a/web/packages/base/components/Notification.tsx b/web/packages/base/components/Notification.tsx
index 76ef48798a..00e848e869 100644
--- a/web/packages/base/components/Notification.tsx
+++ b/web/packages/base/components/Notification.tsx
@@ -1,7 +1,13 @@
-import CloseIcon from "@mui/icons-material/Close";
-import InfoIcon from "@mui/icons-material/InfoOutlined";
+import "@fontsource-variable/outfit";
import {
+ Cancel01Icon,
+ InformationCircleIcon,
+} from "@hugeicons/core-free-icons";
+import { HugeiconsIcon } from "@hugeicons/react";
+import {
+ Box,
IconButton,
+ Paper,
Snackbar,
Stack,
Typography,
@@ -14,16 +20,19 @@ import { RippleDisabledButton } from "ente-base/components/mui/FocusVisibleButto
import type { ModalVisibilityProps } from "ente-base/components/utils/modal";
import type {} from "ente-base/components/utils/mui-theme";
import { isSxArray } from "ente-base/components/utils/sx";
+import { t } from "i18next";
import React from "react";
export interface NotificationAttributes {
captionFirst?: boolean;
color: ButtonProps["color"];
+ /** Set to null to omit the leading icon. */
startIcon?: React.ReactNode;
title: React.ReactNode;
caption?: React.ReactNode;
onClick?: () => void;
endIcon?: React.ReactNode;
+ endIconLabel?: string;
showCloseButtonWithEndIcon?: boolean;
onEndIconClick?: () => void;
}
@@ -37,11 +46,26 @@ type NotificationProps = ModalVisibilityProps & {
sx?: SxProps<Theme>;
};
+const actionButtonSx = {
+ width: 38,
+ height: 38,
+ p: 0,
+ flexShrink: 0,
+ borderRadius: "50%",
+ color: "inherit",
+ bgcolor: "fill.faint",
+ "&:hover": { bgcolor: "fill.faintHover" },
+ "&.Mui-focusVisible": {
+ outline: "2px solid currentColor",
+ outlineOffset: 2,
+ },
+};
+
export const Notification: React.FC<NotificationProps> = ({
open,
onClose,
- horizontal,
- vertical,
+ horizontal = "right",
+ vertical = "bottom",
autoHideDuration,
sx,
attributes,
@@ -56,14 +80,19 @@ export const Notification: React.FC<NotificationProps> = ({
title,
caption,
endIcon,
+ endIconLabel,
showCloseButtonWithEndIcon,
onClick,
onEndIconClick,
} = attributes;
-
- const handleClose: React.MouseEventHandler = (event) => {
- onClose();
- event.stopPropagation();
+ const neutral = !color || color === "inherit";
+ const buttonSx = {
+ ...actionButtonSx,
+ ...(neutral && {
+ color: "text.muted",
+ bgcolor: "fill.fainter",
+ "&:hover": { bgcolor: "fill.faintHover", color: "text.base" },
+ }),
};
const handleClick = () => {
@@ -71,16 +100,67 @@ export const Notification: React.FC<NotificationProps> = ({
if (!keepOpenOnClick) onClose();
};
- const handleEndIconClick: React.MouseEventHandler = (event) => {
- event.stopPropagation();
- if (onEndIconClick) {
- onEndIconClick();
- } else {
- handleClick();
- }
- };
+ const captionElement = caption && (
+ <EllipsizedTypography
+ variant="small"
+ title={typeof caption === "string" ? caption : undefined}
+ sx={{
+ fontFamily: "inherit",
+ fontSize: 14,
+ lineHeight: "20px",
+ color: neutral ? "text.muted" : "inherit",
+ }}
+ >
+ {caption}
+ </EllipsizedTypography>
+ );
+
+ const content = (
+ <Stack
+ direction="row"
+ sx={{ gap: 2, alignItems: "center", width: "100%", minWidth: 0 }}
+ >
+ {startIcon !== null && (
+ <Stack
+ sx={{
+ flexShrink: 0,
+ svg: { width: 24, height: 24, fontSize: 24 },
+ }}
+ >
+ {startIcon ?? (
+ <HugeiconsIcon
+ icon={InformationCircleIcon}
+ size={24}
+ strokeWidth={1.8}
+ />
+ )}
+ </Stack>
+ )}
+ <Stack
+ role="status"
+ sx={{
+ flex: 1,
+ gap: 0.5,
+ textAlign: "left",
+ overflow: "hidden",
+ }}
+ >
+ {captionFirst && captionElement}
+ <Typography
+ sx={{
+ fontFamily: "inherit",
+ fontSize: 18,
+ lineHeight: "24px",
+ fontWeight: 600,
+ }}
+ >
+ {title}
+ </Typography>
+ {!captionFirst && captionElement}
+ </Stack>
+ </Stack>
+ );
- // Inner IconButtons render as divs because the notification is a button.
return (
<Snackbar
open={open}
@@ -88,99 +168,109 @@ export const Notification: React.FC<NotificationProps> = ({
onClose={(_, reason) => {
if (reason === "timeout") onClose();
}}
- anchorOrigin={{
- horizontal: horizontal ?? "right",
- vertical: vertical ?? "bottom",
- }}
+ anchorOrigin={{ horizontal, vertical }}
sx={[
(theme) => ({
- width: "min(320px, 100vw)",
- backgroundColor:
- color && color != "inherit"
- ? `${color}.main`
- : "transparent",
- boxShadow: theme.vars.palette.boxShadow.menu,
+ width: "min(340px, calc(100vw - 32px))",
+ left: horizontal === "left" ? { xs: 16, sm: 24 } : "auto",
+ right: horizontal === "right" ? { xs: 16, sm: 24 } : "auto",
+ ...(vertical === "bottom"
+ ? { bottom: { xs: 16, sm: 24 } }
+ : { top: { xs: 16, sm: 24 } }),
+ borderRadius: "24px",
+ border: "1px solid",
+ borderColor: "rgba(0, 0, 0, 0.06)",
+ ...theme.applyStyles("dark", {
+ borderColor: "rgba(255, 255, 255, 0.06)",
+ }),
+ backgroundColor: neutral
+ ? "background.paper"
+ : `${color}.main`,
+ color: neutral ? "text.base" : `${color}.contrastText`,
+ boxShadow: "0 8px 32px rgba(0, 0, 0, 0.24)",
}),
...(sx ? (isSxArray(sx) ? sx : [sx]) : []),
]}
>
- <RippleDisabledButton
- color={color}
- onClick={handleClick}
+ <Paper
sx={{
- flex: "1",
- padding: "12px 8px 12px 14px",
- borderRadius: "8px",
+ width: "100%",
+ minWidth: 0,
+ display: "flex",
+ alignItems: "center",
+ gap: 2,
+ px: 2.5,
+ py: 2,
+ borderRadius: "inherit",
+ bgcolor: "transparent",
+ backgroundImage: "none",
+ color: "inherit",
+ boxShadow: "none",
+ fontFamily: '"Outfit Variable", sans-serif',
}}
>
- <Stack
- direction="row"
- sx={{
- gap: 2,
- alignItems: "center",
- // Bounds the row so descendants can ellipsize.
- width: "100%",
- }}
- >
- <Stack sx={{ svg: { fontSize: "36px" } }}>
- {startIcon ?? <InfoIcon />}
- </Stack>
-
- <Stack
+ {onClick || !keepOpenOnClick ? (
+ <RippleDisabledButton
+ variant="text"
+ color="inherit"
+ aria-label={
+ typeof title === "string" ? title : undefined
+ }
+ onClick={handleClick}
sx={{
flex: 1,
- gap: 0.5,
+ minWidth: 0,
+ p: 0,
+ fontFamily: "inherit",
textAlign: "left",
- // Lets the caption shrink and ellipsize.
- overflow: "hidden",
+ "&.Mui-focusVisible": {
+ outline: "2px solid currentColor",
+ outlineOffset: 2,
+ },
}}
>
- {captionFirst ? (
- <>
- {caption && (
- <EllipsizedTypography variant="small">
- {caption}
- </EllipsizedTypography>
- )}
- <Typography sx={{ fontWeight: "medium" }}>
- {title}
- </Typography>
- </>
- ) : (
- <>
- <Typography sx={{ fontWeight: "medium" }}>
- {title}
- </Typography>
- {caption && (
- <EllipsizedTypography variant="small">
- {caption}
- </EllipsizedTypography>
- )}
- </>
- )}
- </Stack>
-
+ {content}
+ </RippleDisabledButton>
+ ) : (
+ <Box sx={{ flex: 1, minWidth: 0 }}>{content}</Box>
+ )}
+ <Stack direction="row" sx={{ gap: 1, flexShrink: 0 }}>
{endIcon && (
<IconButton
- component="div"
- onClick={handleEndIconClick}
- sx={{ fontSize: "36px", bgcolor: "fill.faint" }}
+ aria-label={
+ endIconLabel ??
+ (typeof title === "string"
+ ? title
+ : t("more_information"))
+ }
+ onClick={(event) => {
+ event.stopPropagation();
+ if (onEndIconClick) onEndIconClick();
+ else handleClick();
+ }}
+ sx={buttonSx}
>
{endIcon}
</IconButton>
)}
{(!endIcon || showCloseButtonWithEndIcon) && (
<IconButton
- component="div"
- color="inherit"
- onClick={handleClose}
- sx={{ bgcolor: "fill.faint" }}
+ aria-label={t("close")}
+ onClick={(event) => {
+ event.stopPropagation();
+ onClose();
+ }}
+ sx={buttonSx}
>
- <CloseIcon />
+ <HugeiconsIcon
+ icon={Cancel01Icon}
+ size={22}
+ strokeWidth={1.8}
+ />
</IconButton>
)}
</Stack>
- </RippleDisabledButton>
+ </Paper>
</Snackbar>
);
};
diff --git a/web/packages/base/package.json b/web/packages/base/package.json
index d7fa387dfb..ed5bf66a2c 100644
--- a/web/packages/base/package.json
+++ b/web/packages/base/package.json
@@ -6,6 +6,9 @@
"@emotion/react": "11.14.0",
"@emotion/styled": "11.14.1",
"@fontsource-variable/inter": "5.3.0",
+ "@fontsource-variable/outfit": "5.3.0",
+ "@hugeicons/core-free-icons": "4.3.5",
+ "@hugeicons/react": "1.1.10",
"@mui/icons-material": "9.4.0",
"@mui/material": "9.4.0",
"comlink": "4.4.2",
diff --git a/web/packages/gallery/components/DownloadStatusNotifications.tsx b/web/packages/gallery/components/DownloadStatusNotifications.tsx
index 3b76933103..4655589995 100644
--- a/web/packages/gallery/components/DownloadStatusNotifications.tsx
+++ b/web/packages/gallery/components/DownloadStatusNotifications.tsx
@@ -1,11 +1,11 @@
import {
+ AlertCircleIcon,
Download01Icon,
Loading03Icon,
+ ReloadIcon,
Tick02Icon,
} from "@hugeicons/core-free-icons";
import { HugeiconsIcon } from "@hugeicons/react";
-import ErrorOutlinedIcon from "@mui/icons-material/ErrorOutlined";
-import ReplayIcon from "@mui/icons-material/Replay";
import {
Box,
Button,
@@ -182,7 +182,13 @@ export const DownloadStatusNotifications: React.FC<
let startIcon: React.ReactNode;
if (hasErrors) {
- startIcon = <ErrorOutlinedIcon />;
+ startIcon = (
+ <HugeiconsIcon
+ icon={AlertCircleIcon}
+ size={24}
+ strokeWidth={1.8}
+ />
+ );
} else if (isComplete) {
startIcon = (
<GlowingIconWrapper>
@@ -216,38 +222,20 @@ export const DownloadStatusNotifications: React.FC<
key={group.id}
horizontal="left"
sx={(theme) => ({
- "&&": { bottom: `${index * 80 + 20}px` },
- width: "min(400px, 100vw)",
- borderRadius: "20px",
- "& .MuiButton-root": {
- borderRadius: "20px",
- padding: "16px 16px 16px 20px",
- },
- "& .MuiIconButton-root": {
- width: "40px",
- height: "40px",
- "& svg": { fontSize: "22px" },
- },
+ "&&": { bottom: `${index * 96 + 24}px` },
+ width: "min(400px, calc(100vw - 48px))",
+ borderRadius: "24px",
[theme.breakpoints.down("sm")]: {
"&&": {
- bottom: `${index * 70 + 16}px`,
+ bottom: `${index * 96 + 16}px`,
...(fullWidthOnMobile
? { left: "8px" }
: {}),
},
width: fullWidthOnMobile
? "calc(100vw - 16px)"
- : "min(340px, calc(100vw - 16px))",
- borderRadius: "16px",
- "& .MuiButton-root": {
- borderRadius: "16px",
- padding: "12px 12px 12px 16px",
- },
- "& .MuiIconButton-root": {
- width: "36px",
- height: "36px",
- "& svg": { fontSize: "20px" },
- },
+ : "min(340px, calc(100vw - 32px))",
+ borderRadius: "24px",
},
})}
open={true}
@@ -265,14 +253,16 @@ export const DownloadStatusNotifications: React.FC<
caption,
onClick: createOnClick(group),
endIcon: canRetry ? (
- <ReplayIcon
- titleAccess={t("retry")}
- sx={{ color: "white" }}
+ <HugeiconsIcon
+ icon={ReloadIcon}
+ size={22}
+ strokeWidth={1.8}
/>
) : undefined,
onEndIconClick: canRetry
? () => group.retry?.()
: undefined,
+ endIconLabel: t("retry"),
showCloseButtonWithEndIcon: canRetry,
}}
/>