Skip to content

Commit e11c2fd

Browse files
shivamhwpclaude
andauthored
fix(mobile): share PDFs from the Android attachment viewer (#32266)
Co-authored-by: Claude Opus 5.5 <[email protected]>
1 parent 7b680b6 commit e11c2fd

3 files changed

Lines changed: 47 additions & 1 deletion

File tree

‎apps/mobile/src/components/FilePreview.tsx‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import ImageViewing from "react-native-image-viewing";
66
import { useSafeAreaInsets } from "react-native-safe-area-context";
77

88
import { openAttachmentInViewer } from "../lib/attachmentDownload";
9+
import { useMediaActions } from "../state/mediaActions";
910
import type {
1011
ResolvedFilePreviewDocument,
1112
ResolvedFilePreviewSource,
@@ -20,6 +21,8 @@ function PdfDocumentPreview(props: {
2021
readonly onRequestClose: () => void;
2122
}) {
2223
const insets = useSafeAreaInsets();
24+
const media = useMediaActions(props.source.actionsSource);
25+
const save = media.actions.find((action) => action.id === "save");
2326
return (
2427
<Modal
2528
animationType="slide"
@@ -35,6 +38,19 @@ function PdfDocumentPreview(props: {
3538
presentation="inline"
3639
title={props.source.name ?? "PDF"}
3740
onClose={props.onRequestClose}
41+
actions={
42+
save
43+
? [
44+
{
45+
accessibilityLabel: "Save or share",
46+
icon: "square.and.arrow.up",
47+
disabled: save.disabled,
48+
loading: media.sharing,
49+
onPress: () => void save.run(),
50+
},
51+
]
52+
: []
53+
}
3854
/>
3955
<PdfPreview uri={props.source.uri} />
4056
</View>

‎apps/mobile/src/components/FilePreviewModal.tsx‎

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ import { refreshAssetUrl } from "../state/assets";
1414
import { filePreviewGallery, filePreviewKey, filePreviewName } from "../lib/filePreviewGallery";
1515
import { FilePreviewGallery } from "./FilePreviewGallery";
1616
import { FilePreview } from "./FilePreview";
17+
import type { MediaActionsSource } from "../lib/mediaActionsSource";
1718
import type { FilePreviewItem, FilePreviewSource } from "./FilePreviewModal.types";
1819

1920
export type {
@@ -67,6 +68,18 @@ async function resolvePreviewUri(
6768
return { uri: url + (item.srcFragment ?? "") };
6869
}
6970

71+
// Shares from the unresolved item so remote URLs refresh and draft files take their own lease.
72+
function pdfActionsSource(item: FilePreviewItem): MediaActionsSource {
73+
const metadata = {
74+
name: filePreviewName(item),
75+
mimeType: item.mimeType ?? "application/pdf",
76+
...(item.sourceIdentifier ? { sourceIdentifier: item.sourceIdentifier } : {}),
77+
};
78+
if ("uri" in item) return { ...metadata, uri: item.uri };
79+
if ("attachment" in item) return { ...metadata, attachment: item.attachment };
80+
return { ...metadata, environmentId: item.environmentId, resource: item.resource };
81+
}
82+
7083
function ResolvedFilePreview(props: {
7184
readonly source: FilePreviewSource;
7285
readonly onRequestClose: () => void;
@@ -166,9 +179,16 @@ function ResolvedFilePreview(props: {
166179
: []),
167180
]);
168181
};
182+
const actionsSource =
183+
selected.kind === "pdf" ? (selected.actionsSource ?? pdfActionsSource(selected)) : undefined;
169184
return (
170185
<FilePreview
171-
source={{ ...selected, kind: selected.kind, uri }}
186+
source={{
187+
...selected,
188+
kind: selected.kind,
189+
uri,
190+
...(actionsSource ? { actionsSource } : {}),
191+
}}
172192
onRequestClose={props.onRequestClose}
173193
onOpenError={onOpenError}
174194
/>

‎apps/mobile/src/features/files/ThreadFilesRouteScreen.tsx‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -845,6 +845,16 @@ export function ThreadFileScreen(props: ThreadFileRouteScreenProps) {
845845
kind: "pdf",
846846
uri: previewUri,
847847
name: basename(relativePath),
848+
...(environmentId !== null && assetPreview.resource !== null
849+
? {
850+
actionsSource: {
851+
name: basename(relativePath),
852+
mimeType: "application/pdf",
853+
environmentId,
854+
resource: assetPreview.resource,
855+
},
856+
}
857+
: {}),
848858
}),
849859
} as const)
850860
: null,

0 commit comments

Comments
 (0)