π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
Improve accessibility and reply interactions
Anand Baburajan7bed3ad162ef
diff --git a/web/apps/space/src/components/AboutSpaceButton.tsx b/web/apps/space/src/components/AboutSpaceButton.tsxindex e6c21b93c7..bb629cadeb 100644--- a/web/apps/space/src/components/AboutSpaceButton.tsx+++ b/web/apps/space/src/components/AboutSpaceButton.tsx@@ -116,7 +116,6 @@ export const SpaceAboutButton: React.FC<ml: "-12px",p: 0,width: 44,- "&:hover": { bgcolor: "rgba(0, 0, 0, 0.06)" },"&:focus-visible": {outline: "2px solid black",outlineOffset: 3,diff --git a/web/apps/space/src/components/AuthenticatedFriendProfile.tsx b/web/apps/space/src/components/AuthenticatedFriendProfile.tsxindex 8a9a9500ee..862817cc53 100644--- a/web/apps/space/src/components/AuthenticatedFriendProfile.tsx+++ b/web/apps/space/src/components/AuthenticatedFriendProfile.tsx@@ -155,7 +155,10 @@ export const AuthenticatedFriendProfile: React.FC<return (<>- <SpacePageMeta themeColor={spaceAppBackgroundColor} />+ <SpacePageMeta+ themeColor={spaceAppBackgroundColor}+ title={`${friendDisplayName}'s profile`}+ /><ProfileScreenheaderVariant="friend"isCoverLoading={isProfileLoading}diff --git a/web/apps/space/src/components/CaptionText.tsx b/web/apps/space/src/components/CaptionText.tsxindex 66c3bf12fd..9be5d01306 100644--- a/web/apps/space/src/components/CaptionText.tsx+++ b/web/apps/space/src/components/CaptionText.tsx@@ -1,4 +1,5 @@import { Box } from "@mui/material";+import { visuallyHidden } from "@mui/utils";import React from "react";const captionBubbleSx = {@@ -78,9 +79,15 @@ export const SpaceCaptionText: React.FC<{return (<Box component="span" sx={{ display: "grid" }}>+ {lineClamp ? (+ <Box component="span" sx={visuallyHidden}>+ {caption}+ </Box>+ ) : null}{lineClamp ? (<Boxcomponent="span"+ aria-hiddensx={{ ...layerSx, height: 0, overflow: "hidden" }}><Box component="span" ref={measureRef} sx={layerSx}>diff --git a/web/apps/space/src/components/FileViewer.tsx b/web/apps/space/src/components/FileViewer.tsxindex fcfa8358a6..24fceaa1e4 100644--- a/web/apps/space/src/components/FileViewer.tsx+++ b/web/apps/space/src/components/FileViewer.tsx@@ -848,13 +848,7 @@ export const SpaceFileViewer: React.FC<SpaceFileViewerProps> = ({) {event.preventDefault();requestAddFriendForPostAction("reply");- return;}-- if (event.key != "Enter" || event.shiftKey) return;-- event.preventDefault();- sendReply();};const handleInputActionPointerDown = (event: React.PointerEvent) => {diff --git a/web/apps/space/src/components/MessagesPage.tsx b/web/apps/space/src/components/MessagesPage.tsxindex 1578116d46..12dbcda4c7 100644--- a/web/apps/space/src/components/MessagesPage.tsx+++ b/web/apps/space/src/components/MessagesPage.tsx@@ -196,6 +196,8 @@ export const SpaceMessagesPage: React.FC<SpaceMessagesPageProps> = ({selectedFriendFromFriends ??selectedLoadedFriendProfile ??selectedFriendPlaceholder;+ const selectedFriendName =+ selectedFriend?.fullName.trim() || selectedFriend?.username;const selectedFriendSpaceId = selectedFriend? friendSpaceId(selectedFriend): undefined;@@ -667,7 +669,14 @@ export const SpaceMessagesPage: React.FC<SpaceMessagesPageProps> = ({return (<>- <SpacePageMeta themeColor={spaceAppBackgroundColor} />+ <SpacePageMeta+ themeColor={spaceAppBackgroundColor}+ title={+ selectedFriendName+ ? `Messages with ${selectedFriendName}`+ : "Messages"+ }+ /><MessagesScreenconversations={conversations}friendsCount={conversationFriends.length}diff --git a/web/apps/space/src/components/PageMeta.tsx b/web/apps/space/src/components/PageMeta.tsxindex 409a30b23d..610eeb61af 100644--- a/web/apps/space/src/components/PageMeta.tsx+++ b/web/apps/space/src/components/PageMeta.tsx@@ -16,11 +16,13 @@ const previewImages = {interface SpacePageMetaProps {preview?: keyof typeof previewImages;themeColor: string;+ title?: string;}export const SpacePageMeta: React.FC<SpacePageMetaProps> = ({preview,themeColor,+ title,}) => {const previewImage = preview && previewImages[preview];const previewTitle =@@ -32,6 +34,7 @@ export const SpacePageMeta: React.FC<SpacePageMetaProps> = ({return (<Head>+ {title && <title>{`${title} Β· Ente Space`}</title>}<meta name="theme-color" content={themeColor} /><meta name="robots" content="noindex,nofollow" /><metadiff --git a/web/apps/space/src/components/SkipLink.tsx b/web/apps/space/src/components/SkipLink.tsxnew file mode 100644index 0000000000..d69f0c2507--- /dev/null+++ b/web/apps/space/src/components/SkipLink.tsx@@ -0,0 +1,30 @@+import { Box } from "@mui/material";+import { visuallyHidden } from "@mui/utils";+import { spaceAppBackgroundColor, spaceText } from "styles/colors";++export const SpaceSkipLink = () => (+ <Box+ component="a"+ href="#space-main-content"+ onClick={(event) => {+ event.preventDefault();+ document.getElementById("space-main-content")?.focus();+ }}+ sx={{+ bgcolor: spaceText,+ borderRadius: "8px",+ color: spaceAppBackgroundColor,+ fontFamily: '"Inter Variable", Inter, sans-serif',+ fontSize: 14,+ fontWeight: 600,+ left: "8px",+ p: "12px 16px",+ position: "fixed",+ top: "calc(env(safe-area-inset-top) + 8px)",+ zIndex: 1200,+ "&:not(:focus)": visuallyHidden,+ }}+ >+ Skip to main content+ </Box>+);diff --git a/web/apps/space/src/screens/CreateAccountScreen.tsx b/web/apps/space/src/screens/CreateAccountScreen.tsxindex a8f208519d..0d87189a5e 100644--- a/web/apps/space/src/screens/CreateAccountScreen.tsx+++ b/web/apps/space/src/screens/CreateAccountScreen.tsx@@ -180,6 +180,7 @@ const TextInput: React.FC<TextInputProps> = ({}) => {const inputID = useId();const [showPassword, setShowPassword] = useState(false);+ const [visibilityStatus, setVisibilityStatus] = useState("");const isPassword = type == "password";return (@@ -257,9 +258,16 @@ const TextInput: React.FC<TextInputProps> = ({<Boxcomponent="button"type="button"- aria-label="Show password"- aria-pressed={showPassword}- onClick={() => setShowPassword((value) => !value)}+ aria-label={+ showPassword ? "Hide password" : "Show password"+ }+ aria-controls={inputID}+ onClick={() => {+ setShowPassword(!showPassword);+ setVisibilityStatus(+ `${label} is ${showPassword ? "hidden" : "visible"}`,+ );+ }}sx={{alignItems: "center",bgcolor: "transparent",@@ -284,6 +292,9 @@ const TextInput: React.FC<TextInputProps> = ({</Box>)}</Box>+ {isPassword && (+ <SpaceLiveStatus>{visibilityStatus}</SpaceLiveStatus>+ )}</Box>);};diff --git a/web/apps/space/src/screens/FriendsScreen.tsx b/web/apps/space/src/screens/FriendsScreen.tsxindex 0da54419f6..5b995bcd30 100644--- a/web/apps/space/src/screens/FriendsScreen.tsx+++ b/web/apps/space/src/screens/FriendsScreen.tsx@@ -9,8 +9,8 @@ import {import { HugeiconsIcon } from "@hugeicons/react";import { Box, Menu, MenuItem, Skeleton } from "@mui/material";import {- SpaceActionFeedbackIcon,spaceActionDoneDurationMs,+ SpaceActionFeedbackIcon,type SpaceActionPhase,} from "components/ActionFeedback";import { SpaceAddFriendDialog } from "components/AddFriendDialog";@@ -18,6 +18,7 @@ import { SpaceAvatarImage } from "components/AvatarImage";import { ConfirmationActionSheet } from "components/ConfirmationActionSheet";import { SpaceLoadingSpinner } from "components/RouteFallback";import { SpaceShareInviteButton } from "components/ShareInviteButton";+import { SpaceSkipLink } from "components/SkipLink";import type { FriendProfile } from "data/friends";import log from "ente-base/log";import React, { useState } from "react";@@ -731,6 +732,7 @@ export const FriendsScreen: React.FC<FriendsScreenProps> = ({placeItems: { xs: "stretch", sm: "start center" },}}>+ <SpaceSkipLink /><Boxsx={{bgcolor: "transparent",@@ -841,91 +843,96 @@ export const FriendsScreen: React.FC<FriendsScreenProps> = ({username={username}/>- {isLoading ? (- <Box- sx={{- display: "grid",- inset: 0,- placeItems: "center",- position: "absolute",- pointerEvents: "none",- }}- >- <SpaceLoadingSpinner ariaLabel="Loading friends" />- </Box>- ) : friendRequests.length > 0 || friends.length > 0 ? (- <Box- component="ul"- sx={{- display: "flex",- flexDirection: "column",- gap: "4px",- m: 0,- mt: "8px",- p: 0,- width: "100%",- }}- >- {friendRequests.map((request) => (- <FriendRequestRow- key={`request-${request.requestId}`}- request={request}- onAccept={onAcceptFriendRequest}- onDelete={onDeleteFriendRequest}- />- ))}- {friends.map((friend) => (- <FriendRow- key={friend.id}- avatarUrl={loadedAvatarURLFor(friend)}- friend={friend}- onLoadAvatar={() => loadFriendAvatar(friend)}- onMessage={onMessage}- onOpenFriend={onOpenFriend}- onUnfriend={() => {- setUnfriendErrorMessage(null);- setFriendToUnfriend(friend);- }}+ <Box id="space-main-content" tabIndex={-1}>+ {isLoading ? (+ <Box+ sx={{+ display: "grid",+ inset: 0,+ placeItems: "center",+ position: "absolute",+ pointerEvents: "none",+ }}+ >+ <SpaceLoadingSpinner ariaLabel="Loading friends" />+ </Box>+ ) : friendRequests.length > 0 || friends.length > 0 ? (+ <Box+ component="ul"+ sx={{+ display: "flex",+ flexDirection: "column",+ gap: "4px",+ m: 0,+ mt: "8px",+ p: 0,+ width: "100%",+ }}+ >+ {friendRequests.map((request) => (+ <FriendRequestRow+ key={`request-${request.requestId}`}+ request={request}+ onAccept={onAcceptFriendRequest}+ onDelete={onDeleteFriendRequest}+ />+ ))}+ {friends.map((friend) => (+ <FriendRow+ key={friend.id}+ avatarUrl={loadedAvatarURLFor(friend)}+ friend={friend}+ onLoadAvatar={() =>+ loadFriendAvatar(friend)+ }+ onMessage={onMessage}+ onOpenFriend={onOpenFriend}+ onUnfriend={() => {+ setUnfriendErrorMessage(null);+ setFriendToUnfriend(friend);+ }}+ />+ ))}+ </Box>+ ) : (+ <Box+ sx={{+ alignItems: "center",+ color: textSoft,+ display: "flex",+ flexDirection: "column",+ gap: "22px",+ inset: 0,+ justifyContent: "center",+ fontFamily:+ '"Inter Variable", Inter, sans-serif',+ fontSize: 14,+ fontWeight: 500,+ lineHeight: "20px",+ pointerEvents: "none",+ position: "absolute",+ px: "24px",+ textAlign: "center",+ }}+ >+ <Box component="p" sx={{ m: 0, maxWidth: 260 }}>+ Invite your friends and family. Share everyday+ photos and keep up with each other.+ </Box>+ <SpaceShareInviteButton+ profileLink={profileLink}+ sharing={isInviteSharing}+ onShareError={(error) =>+ log.error(+ "Failed to share Space invite link",+ error,+ )+ }+ onSharingChange={setIsInviteSharing}/>- ))}- </Box>- ) : (- <Box- sx={{- alignItems: "center",- color: textSoft,- display: "flex",- flexDirection: "column",- gap: "22px",- inset: 0,- justifyContent: "center",- fontFamily: '"Inter Variable", Inter, sans-serif',- fontSize: 14,- fontWeight: 500,- lineHeight: "20px",- pointerEvents: "none",- position: "absolute",- px: "24px",- textAlign: "center",- }}- >- <Box component="p" sx={{ m: 0, maxWidth: 260 }}>- Invite your friends and family. Share everyday- photos and keep up with each other.</Box>- <SpaceShareInviteButton- profileLink={profileLink}- sharing={isInviteSharing}- onShareError={(error) =>- log.error(- "Failed to share Space invite link",- error,- )- }- onSharingChange={setIsInviteSharing}- />- </Box>- )}+ )}+ </Box></Box><ConfirmationActionSheetopen={Boolean(friendToUnfriend)}diff --git a/web/apps/space/src/screens/HomeScreen.tsx b/web/apps/space/src/screens/HomeScreen.tsxindex ea2b892f53..75e388d56e 100644--- a/web/apps/space/src/screens/HomeScreen.tsx+++ b/web/apps/space/src/screens/HomeScreen.tsx@@ -28,6 +28,7 @@ import { SpacePostPhotosDots } from "components/PostPhotosDots";import { SpacePWAInstallPrompt } from "components/PWAInstallPrompt";import { SpaceLoadingSpinner } from "components/RouteFallback";import { SpaceShareInviteButton } from "components/ShareInviteButton";+import { SpaceSkipLink } from "components/SkipLink";import log from "ente-base/log";import { useBrowserBackClose } from "hooks/use-browser-back-close";import React, { useState } from "react";@@ -2153,6 +2154,7 @@ export const HomeScreen: React.FC<HomeScreenProps> = ({position: "relative",}}>+ <SpaceSkipLink />{hasFeedItems && (<Box component="h1" sx={visuallyHidden}>Home@@ -2183,6 +2185,8 @@ export const HomeScreen: React.FC<HomeScreenProps> = ({/></SpaceHomeHeader><Box+ id="space-main-content"+ tabIndex={-1}sx={{boxSizing: "border-box",display: "flex",diff --git a/web/apps/space/src/screens/LoginScreen.tsx b/web/apps/space/src/screens/LoginScreen.tsxindex d49ad8f887..e2a752cdb0 100644--- a/web/apps/space/src/screens/LoginScreen.tsx+++ b/web/apps/space/src/screens/LoginScreen.tsx@@ -89,6 +89,7 @@ const TextInput: React.FC<TextInputProps> = ({}) => {const inputID = useId();const [showPassword, setShowPassword] = useState(false);+ const [visibilityStatus, setVisibilityStatus] = useState("");const internalInputRef = useRef<HTMLInputElement | null>(null);const isPassword = type == "password";const setInputRef = (element: HTMLInputElement | null) => {@@ -104,7 +105,10 @@ const TextInput: React.FC<TextInputProps> = ({const inputElement = internalInputRef.current;const shouldRestoreFocus = document.activeElement == inputElement;- setShowPassword((value) => !value);+ setShowPassword(!showPassword);+ setVisibilityStatus(+ showPassword ? "Password is hidden" : "Password is visible",+ );if (shouldRestoreFocus) {window.requestAnimationFrame(() =>inputElement?.focus({ preventScroll: true }),@@ -182,8 +186,10 @@ const TextInput: React.FC<TextInputProps> = ({<Boxcomponent="button"type="button"- aria-label="Show password"- aria-pressed={showPassword}+ aria-label={+ showPassword ? "Hide password" : "Show password"+ }+ aria-controls={inputID}onClick={togglePasswordVisibility}onPointerDown={(event) => event.preventDefault()}sx={{@@ -210,6 +216,9 @@ const TextInput: React.FC<TextInputProps> = ({</Box>)}</Box>+ {isPassword && (+ <SpaceLiveStatus>{visibilityStatus}</SpaceLiveStatus>+ )}</Box>);};diff --git a/web/apps/space/src/screens/MessagesScreen.tsx b/web/apps/space/src/screens/MessagesScreen.tsxindex d969555050..5f8bdbd31a 100644--- a/web/apps/space/src/screens/MessagesScreen.tsx+++ b/web/apps/space/src/screens/MessagesScreen.tsx@@ -21,6 +21,7 @@ import { SpacePostPhotoInput } from "components/PostPhotoInput";import { SpacePostPhotosBadge } from "components/PostPhotosBadge";import { SpaceLoadingSpinner } from "components/RouteFallback";import { SpaceShareInviteButton } from "components/ShareInviteButton";+import { SpaceSkipLink } from "components/SkipLink";import { formatTimeAgo } from "ente-base/date";import log from "ente-base/log";import React from "react";@@ -1744,6 +1745,7 @@ export const MessagesScreen: React.FC<MessagesScreenProps> = ({"idle",);const [actionStatus, setActionStatus] = React.useState("");+ const [liveThreadID, setLiveThreadID] = React.useState<string>();const [isInviteSharing, setIsInviteSharing] = React.useState(false);const [activityPostsByKey, setActivityPostsByKey] = React.useState<Record<string, SpaceMessageActivityPost>@@ -1771,6 +1773,11 @@ export const MessagesScreen: React.FC<MessagesScreenProps> = ({const selectedName = selectedFriend? selectedFriend.fullName.trim() || selectedFriend.username: "";+ const selectedThreadID = selectedFriend?.spaceId ?? selectedFriend?.id;+ const isThreadBusy = isThreadLoading || isThreadRecipientLoading;+ React.useEffect(() => {+ setLiveThreadID(isThreadBusy ? undefined : selectedThreadID);+ }, [isThreadBusy, selectedThreadID]);const showInviteEmptyState = friendsCount == 0 && Boolean(profileLink);const emptyConversationsCopy =friendsCount == 0@@ -2209,6 +2216,7 @@ export const MessagesScreen: React.FC<MessagesScreenProps> = ({placeItems: { xs: "stretch", sm: "start center" },}}>+ <SpaceSkipLink /><Boxsx={{bgcolor: "transparent",@@ -2411,11 +2419,17 @@ export const MessagesScreen: React.FC<MessagesScreenProps> = ({{isThreadOpen && selectedFriend ? (<><Box+ id="space-main-content"+ tabIndex={-1}ref={threadScrollRef}role="log"aria-label={`Messages with ${selectedName}`}- aria-busy={- isThreadLoading || isThreadRecipientLoading+ aria-busy={isThreadBusy}+ aria-live={+ !isThreadBusy &&+ liveThreadID == selectedThreadID+ ? "polite"+ : "off"}aria-relevant="additions text"onScroll={handleThreadScroll}@@ -2906,7 +2920,7 @@ export const MessagesScreen: React.FC<MessagesScreenProps> = ({)}</>) : (- <>+ <Box id="space-main-content" tabIndex={-1}>{isConversationsLoading ? (<Boxsx={{@@ -3004,7 +3018,7 @@ export const MessagesScreen: React.FC<MessagesScreenProps> = ({))}</Box>)}- </>+ </Box>)}</Box></Box>diff --git a/web/apps/space/src/screens/ProfileScreen.tsx b/web/apps/space/src/screens/ProfileScreen.tsxindex 43c02c4fed..0d23ca0a06 100644--- a/web/apps/space/src/screens/ProfileScreen.tsx+++ b/web/apps/space/src/screens/ProfileScreen.tsx@@ -31,6 +31,7 @@ import { SpacePostPhotoInput } from "components/PostPhotoInput";import { SpacePostPhotosBadge } from "components/PostPhotosBadge";import { SpaceLoadingSpinner } from "components/RouteFallback";import { SpaceShareIcon } from "components/ShareInviteButton";+import { SpaceSkipLink } from "components/SkipLink";import log from "ente-base/log";import { useBrowserBackClose } from "hooks/use-browser-back-close";import React, { useState } from "react";@@ -1094,6 +1095,7 @@ export const ProfileScreen: React.FC<ProfileScreenProps> = ({position: "relative",}}>+ {!isPublicProfile && <SpaceSkipLink />}<Boxsx={{bgcolor: "transparent",@@ -1200,6 +1202,8 @@ export const ProfileScreen: React.FC<ProfileScreenProps> = ({)}{renderHeader()}<Box+ id={isPublicProfile ? undefined : "space-main-content"}+ tabIndex={isPublicProfile ? undefined : -1}sx={{alignItems: "center",display: "flex",@@ -1719,6 +1723,7 @@ export const ProfileScreen: React.FC<ProfileScreenProps> = ({lineHeight: "20px",m: 0,maxWidth: 250,+ textWrap: "balance",}}>{`${firstName} hasn't posted anything yet.`}diff --git a/web/apps/space/src/screens/SettingsScreen.tsx b/web/apps/space/src/screens/SettingsScreen.tsxindex 06af17c37e..3ddce8aafb 100644--- a/web/apps/space/src/screens/SettingsScreen.tsx+++ b/web/apps/space/src/screens/SettingsScreen.tsx@@ -16,6 +16,7 @@ import { SpaceButtonSpinner } from "components/ButtonSpinner";import { ConfirmationActionSheet } from "components/ConfirmationActionSheet";import { SpaceNotificationPermissionInstructions } from "components/NotificationPermissionInstructions";import { SpacePWAInstallInstructions } from "components/PWAInstallPrompt";+import { SpaceSkipLink } from "components/SkipLink";import log from "ente-base/log";import {isSpaceIOS,@@ -417,6 +418,7 @@ export const SettingsScreen: React.FC<SettingsScreenProps> = ({placeItems: { xs: "stretch", sm: "start center" },}}>+ <SpaceSkipLink /><Boxsx={{bgcolor: "transparent",@@ -488,6 +490,8 @@ export const SettingsScreen: React.FC<SettingsScreenProps> = ({<Boxcomponent="section"+ id="space-main-content"+ tabIndex={-1}sx={{display: "flex",flexDirection: "column",@@ -646,6 +650,7 @@ export const ChangeNameSettingsScreen: React.FC<placeItems: { xs: "stretch", sm: "start center" },}}>+ <SpaceSkipLink /><Boxsx={{bgcolor: "transparent",@@ -717,6 +722,8 @@ export const ChangeNameSettingsScreen: React.FC<<Boxcomponent="form"+ id="space-main-content"+ tabIndex={-1}onSubmit={handleSubmit}sx={{boxSizing: "border-box",diff --git a/web/apps/space/src/utils/page-titles.ts b/web/apps/space/src/utils/page-titles.tsindex 93c4e0031f..9ad8670ca5 100644--- a/web/apps/space/src/utils/page-titles.ts+++ b/web/apps/space/src/utils/page-titles.ts@@ -7,10 +7,9 @@ const pageTitles: Record<string, string> = {"/passkeys/finish": "Complete verification","/create-profile": "Create profile","/add-profile-photo": "Add profile photo",- "/app": "Home","/app/friends": "Friends","/app/messages": "Messages",- "/app/messages/[spaceId]": "Conversation",+ "/app/messages/[spaceId]": "Messages","/app/post": "Create post","/app/posts/[spaceId]/[postId]": "Post","/app/profile": "Your profile",