Skip to content

armgit / ente

Public Imported from GitHub
0

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

Fix caption compatibility and unavailable photo corners

Anand Baburajanbb4d3573b0ff
diff --git a/web/apps/space/src/components/CaptionText.tsx b/web/apps/space/src/components/CaptionText.tsx
index 61a06c545c..66c3bf12fd 100644
--- a/web/apps/space/src/components/CaptionText.tsx
+++ b/web/apps/space/src/components/CaptionText.tsx
@@ -9,6 +9,11 @@ const captionBubbleSx = {
WebkitBoxDecorationBreak: "clone",
} as const;
+const captionSegmenter =
+ typeof Intl !== "undefined" && "Segmenter" in Intl
+ ? new Intl.Segmenter(undefined, { granularity: "grapheme" })
+ : null;
+
export const SpaceCaptionText: React.FC<{
caption: string;
lineClamp?: number;
@@ -30,12 +35,12 @@ export const SpaceCaptionText: React.FC<{
return;
}
- const characters = Array.from(
- new Intl.Segmenter(undefined, {
- granularity: "grapheme",
- }).segment(caption),
- ({ segment }) => segment,
- );
+ const characters = captionSegmenter
+ ? Array.from(
+ captionSegmenter.segment(caption),
+ ({ segment }) => segment,
+ )
+ : Array.from(caption);
const truncated = (length: number) =>
`${characters.slice(0, length).join("").trimEnd()}…`;
let start = 0;
diff --git a/web/apps/space/src/screens/HomeScreen.tsx b/web/apps/space/src/screens/HomeScreen.tsx
index 6ff7d608f1..f45ead3718 100644
--- a/web/apps/space/src/screens/HomeScreen.tsx
+++ b/web/apps/space/src/screens/HomeScreen.tsx
@@ -1148,7 +1148,7 @@ const FeedItem: React.FC<FeedItemProps> = ({
sx={{
aspectRatio: frameAspectRatio,
bgcolor: "transparent",
- borderRadius: isOwnPost ? "16px" : "16px 16px 0 0",
+ borderRadius: showFooter ? "16px 16px 0 0" : "16px",
maxWidth: "100%",
minWidth: 0,
overflow: "hidden",