Skip to content

armgit / ente

Public Imported from GitHub
0

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

Fix post fallback navigation and formatting

Anand Baburajan8149e7ab7d34
diff --git a/web/apps/space/src/components/FileViewer.tsx b/web/apps/space/src/components/FileViewer.tsx
index 15f83e2266..a98268f8ab 100644
--- a/web/apps/space/src/components/FileViewer.tsx
+++ b/web/apps/space/src/components/FileViewer.tsx
@@ -124,10 +124,7 @@ const postButtonSpin = keyframes`
`;
export type SpaceViewerPostActionMode =
- | "draft-post"
- | "hidden"
- | "like-only"
- | "likes";
+ "draft-post" | "hidden" | "like-only" | "likes";
interface SpaceViewerPostActionConfig {
showLikeButton: boolean;
@@ -1427,8 +1424,7 @@ export const SpaceFileViewer: React.FC<SpaceFileViewerProps> = ({
if (document.documentElement.hasAttribute("data-space-ios-pwa"))
headerObserver.observe(viewerHeaderRef.current!);
let swipeStart:
- | { x: number; y: number; photoIndex: number }
- | undefined;
+ { x: number; y: number; photoIndex: number } | undefined;
const loadPhotoSwipe = import("photoswipe");
void loadPhotoSwipe.catch((error: unknown) => {
diff --git a/web/apps/space/src/components/RouteFallback.tsx b/web/apps/space/src/components/RouteFallback.tsx
index 8baf87b9d3..3a0faebf76 100644
--- a/web/apps/space/src/components/RouteFallback.tsx
+++ b/web/apps/space/src/components/RouteFallback.tsx
@@ -1,11 +1,15 @@
+import { ArrowLeft02Icon } from "@hugeicons/core-free-icons";
+import { HugeiconsIcon } from "@hugeicons/react";
import { Box } from "@mui/material";
import { SpacePageMeta } from "components/PageMeta";
import React from "react";
import { spaceAppBackground, spaceText } from "styles/colors";
+import { spaceTouchTargetSize } from "styles/touch-targets";
interface SpaceRouteFallbackProps {
background: string;
message?: string;
+ onBack?: () => void;
preview?: "home" | "invite";
}
@@ -43,10 +47,46 @@ export const SpaceLoadingSpinner: React.FC<SpaceLoadingSpinnerProps> = ({
export const SpaceRouteFallback: React.FC<SpaceRouteFallbackProps> = ({
background,
message,
+ onBack,
preview,
}) => (
<>
<SpacePageMeta themeColor={background} preview={preview} />
+ {onBack && (
+ <Box
+ component="button"
+ type="button"
+ aria-label="Back"
+ onClick={onBack}
+ sx={{
+ alignItems: "center",
+ bgcolor: "transparent",
+ border: 0,
+ color: spaceText,
+ cursor: "pointer",
+ display: "flex",
+ height: spaceTouchTargetSize,
+ justifyContent: "flex-start",
+ left: "max(16px, var(--space-ios-safe-area-left, 0px))",
+ p: 0,
+ position: "fixed",
+ top: "calc(12px + var(--space-ios-safe-area-top, 0px))",
+ width: spaceTouchTargetSize,
+ zIndex: 1,
+ "&:focus-visible": {
+ borderRadius: "50%",
+ outline: "2px solid #08C225",
+ outlineOffset: 2,
+ },
+ }}
+ >
+ <HugeiconsIcon
+ icon={ArrowLeft02Icon}
+ size={24}
+ strokeWidth={1.8}
+ />
+ </Box>
+ )}
<Box
sx={{
alignItems: "center",
diff --git a/web/apps/space/src/pages/app/posts/[spaceId]/[postId].tsx b/web/apps/space/src/pages/app/posts/[spaceId]/[postId].tsx
index 63eed5aa93..71dd84c09d 100644
--- a/web/apps/space/src/pages/app/posts/[spaceId]/[postId].tsx
+++ b/web/apps/space/src/pages/app/posts/[spaceId]/[postId].tsx
@@ -166,6 +166,7 @@ const Page: React.FC = () => {
<SpaceRouteFallback
background={spaceAppBackgroundColor}
message={postLoadError || profileLoadError}
+ onBack={closePost}
/>
);
}
@@ -175,6 +176,7 @@ const Page: React.FC = () => {
<SpaceRouteFallback
background={spaceAppBackgroundColor}
message={postLoadError || profileLoadError}
+ onBack={closePost}
/>
);
}
@@ -194,6 +196,7 @@ const Page: React.FC = () => {
<SpaceRouteFallback
background={spaceAppBackgroundColor}
message="Photo unavailable."
+ onBack={closePost}
/>
);
}
diff --git a/web/apps/space/src/screens/ProfileScreen.tsx b/web/apps/space/src/screens/ProfileScreen.tsx
index f67647b9ea..ae9799914f 100644
--- a/web/apps/space/src/screens/ProfileScreen.tsx
+++ b/web/apps/space/src/screens/ProfileScreen.tsx
@@ -578,9 +578,9 @@ export const ProfileScreen: React.FC<ProfileScreenProps> = ({
setIsInviteLinkCopied(true);
}
} catch (error) {
- if (
- !(error instanceof DOMException && error.name == "AbortError")
- ) {
+ if (!(
+ error instanceof DOMException && error.name == "AbortError"
+ )) {
log.warn("Failed to share Space invite link", error);
}
}
diff --git a/web/apps/space/src/services/space.ts b/web/apps/space/src/services/space.ts
index 6e1d3421ac..ae4f5d7307 100644
--- a/web/apps/space/src/services/space.ts
+++ b/web/apps/space/src/services/space.ts
@@ -1309,8 +1309,7 @@ export const createCurrentMediaPost = async ({
return session.postId;
} catch (error) {
const uploadError = error as
- | (Error & { status?: number; code?: string })
- | undefined;
+ (Error & { status?: number; code?: string }) | undefined;
logToDisk(
`[error] Space post upload failed ${JSON.stringify({ requestId: session.requestId, stage, itemIndex, itemCount: images.length, bytes, status: uploadError?.status, code: uploadError?.code, name: uploadError?.name, message: uploadError?.message, stack: uploadError?.stack })}`.replaceAll(
spaceId,
diff --git a/web/apps/space/src/utils/route-transitions.tsx b/web/apps/space/src/utils/route-transitions.tsx
index 101edd4ada..63c92e5e97 100644
--- a/web/apps/space/src/utils/route-transitions.tsx
+++ b/web/apps/space/src/utils/route-transitions.tsx
@@ -56,8 +56,7 @@ const initializeRouteHistory = (router: NextRouter) => {
__N: boolean;
};
const navigation = performance.getEntriesByType("navigation")[0] as
- | PerformanceNavigationTiming
- | undefined;
+ PerformanceNavigationTiming | undefined;
if (navigation?.type == "reload") {
try {
const saved = JSON.parse(