Skip to content

Commit 6fd72f8

Browse files
only21milclaude
andcommitted
fix(forgejo): uploads inside list items load on mobile too
Enriched hands only standalone images to renderMedia and draws the rest natively from their raw URL, so an upload inside a list item stayed blank. The pull request view now passes resolveImageSource, which signs those images through the same resolver and asset route. Co-Authored-By: Claude Opus 5.5 <[email protected]>
1 parent 4df518c commit 6fd72f8

2 files changed

Lines changed: 34 additions & 2 deletions

File tree

‎apps/mobile/src/features/pull-requests/PullRequestMarkdown.tsx‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import { pullRequestTarget, type PullRequestParams } from "./usePullRequestDiff"
66
import {
77
PullRequestMedia,
88
PullRequestMediaContext,
9+
usePullRequestImageSource,
910
usePullRequestMediaUrl,
1011
} from "./PullRequestMedia";
1112
import { videoMimeType } from "@t3tools/shared/video";
@@ -163,6 +164,7 @@ function PullRequestMarkdownContent(props: {
163164
(image) => <MarkdownImage href={resolve(image.href)} alt={image.alt} onPreview={setPreview} />,
164165
[resolve],
165166
);
167+
const resolveImageSource = usePullRequestImageSource(resolve);
166168
const styles = useMarkdownPreviewStyles();
167169
return (
168170
<FilePreviewGallery value={gallery}>
@@ -171,6 +173,7 @@ function PullRequestMarkdownContent(props: {
171173
textStyle={styles.nativeTextStyle}
172174
onLinkPress={openLink}
173175
renderImage={renderImage}
176+
resolveImageSource={resolveImageSource}
174177
onImagePress={(href) => setPreview(pullRequestImageSource(resolve(href), mediaContext))}
175178
/>
176179
<FilePreviewModal source={preview} onRequestClose={() => setPreview(null)} />

‎apps/mobile/src/features/pull-requests/PullRequestMedia.tsx‎

Lines changed: 31 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { createContext, useContext, useMemo, useState } from "react";
1+
import { createContext, useCallback, useContext, useMemo, useState } from "react";
22
import { pullRequestMediaSource, pullRequestImageSource } from "./pullRequestMediaSource";
33
import { useFilePreviewGallery } from "../../components/FilePreviewGallery";
44
import { sourceControlClients } from "@t3tools/client-runtime/source-control-clients";
@@ -7,11 +7,15 @@ import {
77
type AssetResource,
88
type EnvironmentId,
99
} from "@t3tools/contracts";
10+
import { assetUrlStateFromResult } from "@t3tools/client-runtime/state/assets";
1011
import { videoMimeType } from "@t3tools/shared/video";
1112
import { Pressable, View } from "react-native";
1213
import { Image } from "expo-image";
1314
import { AppText } from "../../components/ui/AppText";
14-
import { useAssetUrlState, useRefreshAssetUrl } from "../../state/assets";
15+
import { assetEnvironment, useAssetUrlState, useRefreshAssetUrl } from "../../state/assets";
16+
import { usePreparedConnection } from "../../state/session";
17+
import { useAtomQueryRunner } from "../../state/use-atom-query-runner";
18+
import type { MarkdownImageSourceResolver } from "../../native/SelectableMarkdownText";
1519
import { MediaVideoPlayer } from "../../components/MediaVideoPlayer";
1620
import { VideoAttachmentTile } from "../../components/VideoAttachmentTile";
1721
import { VideoPreviewModal, type VideoPreviewSource } from "../../components/VideoPreviewModal";
@@ -47,6 +51,31 @@ export function usePullRequestMediaUrl(url: string) {
4751
};
4852
}
4953

54+
/** Images Enriched draws natively, such as one inside a list item, load like the standalone ones. */
55+
export function usePullRequestImageSource(
56+
resolve: (url: string) => string,
57+
): MarkdownImageSourceResolver {
58+
const context = useContext(PullRequestMediaContext);
59+
const connection = usePreparedConnection(context?.environmentId ?? null);
60+
const httpBaseUrl = connection._tag === "Some" ? connection.value.httpBaseUrl : null;
61+
const createUrl = useAtomQueryRunner(assetEnvironment.createUrl, { reportFailure: false });
62+
return useCallback(
63+
async (image) => {
64+
const url = resolve(image.href);
65+
const fetchUrl = sourceControlClients.mediaUrl(url)?.fetchUrl;
66+
if (!context || !fetchUrl) return /^https?:\/\//i.test(url) ? { uri: url } : null;
67+
const resource = { _tag: SOURCE_CONTROL_MEDIA_ASSET, cwd: context.cwd, url: fetchUrl };
68+
const state = assetUrlStateFromResult(
69+
await createUrl({ environmentId: context.environmentId, input: { resource } }),
70+
httpBaseUrl,
71+
);
72+
if (state._tag !== "Success") throw new Error("Pull request image is unavailable");
73+
return { uri: state.url };
74+
},
75+
[context, createUrl, httpBaseUrl, resolve],
76+
);
77+
}
78+
5079
export function PullRequestMedia(props: {
5180
readonly url: string;
5281
readonly kind: "image" | "video" | "unknown";

0 commit comments

Comments
 (0)