π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
[web][photos] Use context menu for family member actions
AswinAsok2c3a3bc6399e
diff --git a/web/apps/photos/src/components/ContextMenu.tsx b/web/apps/photos/src/components/ContextMenu.tsxnew file mode 100644index 0000000000..2df8215a6e--- /dev/null+++ b/web/apps/photos/src/components/ContextMenu.tsx@@ -0,0 +1,41 @@+import { Menu, MenuItem, styled } from "@mui/material";++export const ContextMenu = styled(Menu)(({ theme }) => ({+ "& .MuiPaper-root": {+ backgroundColor: "#1f1f1f",+ minWidth: 220,+ borderRadius: 12,+ boxShadow: "0 8px 24px rgba(0, 0, 0, 0.35)",+ marginTop: 6,+ },+ "& .MuiList-root": { padding: theme.spacing(1) },+ ...theme.applyStyles("dark", {+ "& .MuiPaper-root": {+ backgroundColor: "#161616",+ boxShadow: "0 8px 24px rgba(0, 0, 0, 0.6)",+ },+ }),+}));++export const ContextMenuItem = styled(MenuItem, {+ shouldForwardProp: (prop) => prop !== "destructive",+})<{ destructive?: boolean }>(({ theme, destructive }) => ({+ display: "flex",+ alignItems: "center",+ gap: 12,+ padding: theme.spacing(1.5, 2),+ borderRadius: 10,+ color: "#f5f5f5",+ fontSize: 15,+ "&:hover": { backgroundColor: "rgba(255, 255, 255, 0.08)" },+ "& .MuiListItemIcon-root": { minWidth: 0, color: "inherit" },+ "& .MuiListItemText-root": { margin: 0 },+ "& .MuiListItemText-primary": { color: "inherit", fontSize: "inherit" },+ ...(destructive && {+ color: theme.vars.palette.critical.main,+ "&:hover": {+ backgroundColor: theme.vars.palette.critical.main,+ color: "#fff",+ },+ }),+}));diff --git a/web/apps/photos/src/components/FamilyManagement.tsx b/web/apps/photos/src/components/FamilyManagement.tsxindex d6e4d3c0ea..e57d9d9f1c 100644--- a/web/apps/photos/src/components/FamilyManagement.tsx+++ b/web/apps/photos/src/components/FamilyManagement.tsx@@ -1,3 +1,4 @@+import { ContextMenu, ContextMenuItem } from "@/components/ContextMenu";import { avatarBackgroundColor, avatarTextColor } from "@/services/avatar";import {createFamily,@@ -6,13 +7,7 @@ import {removeFamilyMember,revokeFamilyInvite,} from "@/services/family";-import {- AddOutlined,- ChevronRightOutlined,- DeleteOutlined,- EditOutlined,- RefreshOutlined,-} from "@mui/icons-material";+import { AddOutlined, ChevronRightOutlined } from "@mui/icons-material";import {Avatar,Box,@@ -23,12 +18,6 @@ import {TextField,Typography,} from "@mui/material";-import {- RowButton,- RowButtonDivider,- RowButtonEndActivityIndicator,- RowButtonGroup,-} from "ente-base/components/RowButton";import { ActivityIndicator } from "ente-base/components/mui/ActivityIndicator";import { DialogCloseIconButton } from "ente-base/components/mui/DialogCloseIconButton";import { FocusVisibleButton } from "ente-base/components/mui/FocusVisibleButton";@@ -65,6 +54,8 @@ export const FamilyManagement: React.FC<FamilyManagementProps> = ({const fullScreen = useIsSmallWidth();const [inviteOpen, setInviteOpen] = useState(false);const [selectedMember, setSelectedMember] = useState<FamilyMember>();+ const [memberActionsAnchor, setMemberActionsAnchor] =+ useState<HTMLElement | null>(null);const [editingMember, setEditingMember] = useState<FamilyMember>();const [resendingID, setResendingID] = useState<string>();@@ -164,7 +155,10 @@ export const FamilyManagement: React.FC<FamilyManagementProps> = ({<FamilyDashboard{...{ userDetails, members, isAdmin }}onInvite={() => setInviteOpen(true)}- onManage={setSelectedMember}+ onManage={(member, anchor) => {+ setSelectedMember(member);+ setMemberActionsAnchor(anchor);+ }}onLeave={confirmLeave}/>) : (@@ -183,7 +177,8 @@ export const FamilyManagement: React.FC<FamilyManagementProps> = ({onClose={() => setInviteOpen(false)}create={!members.length}/>- <MemberActionsDialog+ <MemberActionsMenu+ anchorEl={memberActionsAnchor}member={selectedMember}resending={selectedMember?.id == resendingID}onClose={() => setSelectedMember(undefined)}@@ -236,7 +231,7 @@ interface FamilyDashboardProps {members: FamilyMember[];isAdmin: boolean;onInvite: () => void;- onManage: (member: FamilyMember) => void;+ onManage: (member: FamilyMember, anchor: HTMLElement) => void;onLeave: () => void;}@@ -329,7 +324,7 @@ const FamilyMemberRow: React.FC<{member: FamilyMember;isAdmin: boolean;color: string;- onManage: (member: FamilyMember) => void;+ onManage: (member: FamilyMember, anchor: HTMLElement) => void;}> = ({ member, isAdmin, color, onManage }) => {const invited = member.status == "INVITED";const manageable = isAdmin && !member.isAdmin;@@ -379,7 +374,8 @@ const FamilyMemberRow: React.FC<{return manageable ? (<FocusVisibleButtonfullWidth- onClick={() => onManage(member)}+ aria-haspopup="menu"+ onClick={(event) => onManage(member, event.currentTarget)}sx={{display: "block",p: 0,@@ -398,67 +394,50 @@ const FamilyMemberRow: React.FC<{);};-const MemberActionsDialog: React.FC<{+const MemberActionsMenu: React.FC<{+ anchorEl: HTMLElement | null;member?: FamilyMember;resending: boolean;onClose: () => void;onEdit: (member: FamilyMember) => void;onRemove: (member: FamilyMember) => void;onResend: (member: FamilyMember) => void;-}> = ({ member, resending, onClose, onEdit, onRemove, onResend }) => {- if (!member) return null;-- const invited = member.status == "INVITED";+}> = ({ anchorEl, member, resending, onClose, onEdit, onRemove, onResend }) => {+ const invited = member?.status == "INVITED";return (- <Dialog open onClose={onClose} maxWidth="xs" fullWidth>- <Stack direction="row" sx={{ p: "20px 16px 8px 24px" }}>- <Typography variant="h3" noWrap sx={{ flex: 1, minWidth: 0 }}>- {member.email}- </Typography>- <DialogCloseIconButton {...{ onClose }} />- </Stack>- <DialogContent>- <RowButtonGroup>- {invited ? (- <>- <RowButton- disabled={resending}- startIcon={<RefreshOutlined />}- endIcon={- resending ? (- <RowButtonEndActivityIndicator />- ) : undefined- }- label={t("resend_family_invite")}- onClick={() => onResend(member)}- />- <RowButtonDivider />- <RowButton- color="critical"- startIcon={<DeleteOutlined />}- label={t("revoke_family_invite")}- onClick={() => onRemove(member)}- />- </>- ) : (- <>- <RowButton- startIcon={<EditOutlined />}- label={t("set_storage_limit")}- onClick={() => onEdit(member)}- />- <RowButtonDivider />- <RowButton- color="critical"- startIcon={<DeleteOutlined />}- label={t("remove_family_member")}- onClick={() => onRemove(member)}- />- </>- )}- </RowButtonGroup>- </DialogContent>- </Dialog>+ <ContextMenu+ sx={{ "& .MuiMenuItem-root": { fontSize: 14, lineHeight: "20px" } }}+ anchorEl={anchorEl}+ open={!!member}+ onClose={onClose}+ anchorOrigin={{ vertical: "bottom", horizontal: "right" }}+ transformOrigin={{ vertical: "top", horizontal: "right" }}+ slotProps={{+ list: { "aria-label": member?.email, "aria-busy": resending },+ }}+ >+ <ContextMenuItem+ disabled={resending}+ onClick={() => {+ if (member) {+ if (invited) onResend(member);+ else onEdit(member);+ }+ }}+ >+ {t(invited ? "resend_family_invite" : "set_storage_limit")}+ {resending && <ActivityIndicator size="16px" sx={{ ml: 1 }} />}+ </ContextMenuItem>+ <ContextMenuItem+ disabled={resending}+ destructive+ onClick={() => {+ if (member) onRemove(member);+ }}+ >+ {t(invited ? "revoke_family_invite" : "family_remove_action")}+ </ContextMenuItem>+ </ContextMenu>);};diff --git a/web/apps/photos/src/components/FileContextMenu.tsx b/web/apps/photos/src/components/FileContextMenu.tsxindex a81271cdab..09a754b57e 100644--- a/web/apps/photos/src/components/FileContextMenu.tsx+++ b/web/apps/photos/src/components/FileContextMenu.tsx@@ -1,3 +1,4 @@+import { ContextMenu, ContextMenuItem } from "@/components/ContextMenu";import type { FileContextAction } from "@/utils/file-actions";import {AddSquareIcon,@@ -18,13 +19,7 @@ import {ViewOffSlashIcon,} from "@hugeicons/core-free-icons";import { HugeiconsIcon, type IconSvgElement } from "@hugeicons/react";-import {- ListItemIcon,- ListItemText,- Menu,- MenuItem,- styled,-} from "@mui/material";+import { ListItemIcon, ListItemText } from "@mui/material";import { t } from "i18next";import React, { memo, useCallback, useMemo } from "react";@@ -103,7 +98,7 @@ export const FileContextMenu: React.FC<FileContextMenuProps> = memo(}, [actions]);return (- <StyledMenu+ <ContextMenuopen={open}onClose={onClose}disableAutoFocusItem@@ -119,71 +114,34 @@ export const FileContextMenu: React.FC<FileContextMenuProps> = memo({primaryActions.map((action) => {const { label, Icon } = actionConfigs[action];return (- <StyledMenuItem+ <ContextMenuItemkey={action}onClick={() => handleActionClick(action)}><ListItemIcon>{Icon}</ListItemIcon><ListItemText>{t(label)}</ListItemText>- </StyledMenuItem>+ </ContextMenuItem>);})}{destructiveActions.map((action) => {const { label, Icon } = actionConfigs[action];return (- <StyledMenuItem+ <ContextMenuItemkey={action}onClick={() => handleActionClick(action)}- sx={{- color: "critical.main",- "&:hover": {- backgroundColor: "critical.main",- color: "#fff",- },- }}+ destructive><ListItemIcon sx={{ color: "inherit" }}>{Icon}</ListItemIcon><ListItemText>{t(label)}</ListItemText>- </StyledMenuItem>+ </ContextMenuItem>);})}- </StyledMenu>+ </ContextMenu>);},);FileContextMenu.displayName = "FileContextMenu";--const StyledMenu = styled(Menu)(({ theme }) => ({- "& .MuiPaper-root": {- backgroundColor: "#1f1f1f",- minWidth: 220,- borderRadius: 12,- boxShadow: "0 8px 24px rgba(0, 0, 0, 0.35)",- marginTop: 6,- },- "& .MuiList-root": { padding: theme.spacing(1) },- ...theme.applyStyles("dark", {- "& .MuiPaper-root": {- backgroundColor: "#161616",- boxShadow: "0 8px 24px rgba(0, 0, 0, 0.6)",- },- }),-}));--const StyledMenuItem = styled(MenuItem)(({ theme }) => ({- display: "flex",- alignItems: "center",- gap: 12,- padding: theme.spacing(1.5, 2),- borderRadius: 10,- color: "#f5f5f5",- fontSize: 15,- "&:hover": { backgroundColor: "rgba(255, 255, 255, 0.08)" },- "& .MuiListItemIcon-root": { minWidth: 0, color: "inherit" },- "& .MuiListItemText-root": { margin: 0 },- "& .MuiListItemText-primary": { color: "inherit", fontSize: "inherit" },-}));diff --git a/web/packages/base/locales/en-US/translation.json b/web/packages/base/locales/en-US/translation.jsonindex 9ab6f056f4..f8bdde31fd 100644--- a/web/packages/base/locales/en-US/translation.json+++ b/web/packages/base/locales/en-US/translation.json@@ -401,6 +401,7 @@"revoke_family_invite": "Revoke invite","revoke_family_invite_confirm": "Revoke the invite sent to {{email}}?","revoke": "Revoke",+ "family_remove_action": "Remove from family","remove_family_member": "Remove family member","remove_family_member_confirm": "Remove {{email}} from your family?","set_storage_limit": "Set storage limit",