Skip to content

Commit 18f4de3

Browse files
committed
fix(mobile): keep native image resolution in the markdown renderer
1 parent f4bbf12 commit 18f4de3

2 files changed

Lines changed: 39 additions & 35 deletions

File tree

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

Lines changed: 37 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,23 @@ import { pullRequestTarget, type PullRequestParams } from "./usePullRequestDiff"
66
import {
77
PullRequestMedia,
88
PullRequestMediaContext,
9-
usePullRequestImageSource,
109
usePullRequestMediaUrl,
1110
} from "./PullRequestMedia";
1211
import { videoMimeType } from "@t3tools/shared/video";
13-
import { createContext, useContext, useMemo, useState } from "react";
12+
import { createContext, useCallback, useContext, useMemo, useState } from "react";
1413
import {
1514
changeRequestLinkResolver,
1615
changeRequestReferenceAutolinker,
1716
} from "@t3tools/client-runtime/pull-request-markdown";
18-
import type { ReferenceAutolink } from "@t3tools/client-runtime/source-control-clients";
17+
import {
18+
sourceControlClients,
19+
type ReferenceAutolink,
20+
} from "@t3tools/client-runtime/source-control-clients";
21+
import { SOURCE_CONTROL_MEDIA_ASSET } from "@t3tools/contracts";
22+
import { assetUrlStateFromResult } from "@t3tools/client-runtime/state/assets";
23+
import { assetEnvironment } from "../../state/assets";
24+
import { usePreparedConnection } from "../../state/session";
25+
import { useAtomQueryRunner } from "../../state/use-atom-query-runner";
1926
import { linkReferenceAutolinks } from "./pullRequestAutolinks";
2027

2128
import { useOpenPullRequest } from "../../native/useOpenPullRequest";
@@ -30,7 +37,10 @@ import {
3037
type FilePreviewItem,
3138
} from "../../components/FilePreviewModal";
3239
import { ThreadMarkdownImageView } from "../threads/ThreadMarkdownImage";
33-
import type { MarkdownImageRenderer } from "../../native/SelectableMarkdownText";
40+
import type {
41+
MarkdownImageRenderer,
42+
MarkdownImageSourceResolver,
43+
} from "../../native/SelectableMarkdownText";
3444

3545
const AutolinksContext = createContext<((text: string) => ReadonlyArray<ReferenceAutolink>) | null>(
3646
null,
@@ -66,6 +76,29 @@ export function PullRequestMarkdownRepository(props: {
6676
);
6777
}
6878

79+
/** Images Enriched draws natively, such as one inside a list item, load like the standalone ones. */
80+
function usePullRequestImageSource(resolve: (url: string) => string): MarkdownImageSourceResolver {
81+
const context = useContext(PullRequestMediaContext);
82+
const connection = usePreparedConnection(context?.environmentId ?? null);
83+
const httpBaseUrl = connection._tag === "Some" ? connection.value.httpBaseUrl : null;
84+
const createUrl = useAtomQueryRunner(assetEnvironment.createUrl, { reportFailure: false });
85+
return useCallback(
86+
async (image) => {
87+
const url = resolve(image.href);
88+
const fetchUrl = sourceControlClients.mediaUrl(url)?.fetchUrl;
89+
if (!context || !fetchUrl) return /^https?:\/\//i.test(url) ? { uri: url } : null;
90+
const resource = { _tag: SOURCE_CONTROL_MEDIA_ASSET, cwd: context.cwd, url: fetchUrl };
91+
const state = assetUrlStateFromResult(
92+
await createUrl({ environmentId: context.environmentId, input: { resource } }),
93+
httpBaseUrl,
94+
);
95+
if (state._tag !== "Success") throw new Error("Pull request image is unavailable");
96+
return { uri: state.url };
97+
},
98+
[context, createUrl, httpBaseUrl, resolve],
99+
);
100+
}
101+
69102
function MarkdownImage(props: {
70103
readonly href: string;
71104
readonly alt: string | null;

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

Lines changed: 2 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { createContext, useCallback, useContext, useState } from "react";
1+
import { createContext, useContext, 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,15 +7,11 @@ import {
77
type AssetResource,
88
type EnvironmentId,
99
} from "@t3tools/contracts";
10-
import { assetUrlStateFromResult } from "@t3tools/client-runtime/state/assets";
1110
import { videoMimeType } from "@t3tools/shared/video";
1211
import { Pressable, View } from "react-native";
1312
import { Image } from "expo-image";
1413
import { AppText } from "../../components/ui/AppText";
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";
14+
import { useAssetUrlState, useRefreshAssetUrl } from "../../state/assets";
1915
import { MediaVideoPlayer } from "../../components/MediaVideoPlayer";
2016
import { VideoAttachmentTile } from "../../components/VideoAttachmentTile";
2117
import { VideoPreviewModal, type VideoPreviewSource } from "../../components/VideoPreviewModal";
@@ -50,31 +46,6 @@ export function usePullRequestMediaUrl(url: string) {
5046
};
5147
}
5248

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

0 commit comments

Comments
 (0)