Skip to content

Commit 70791c7

Browse files
authored
Merge branch 'main' into fix/subagent-approval-push
2 parents ea1e68b + 8f14482 commit 70791c7

58 files changed

Lines changed: 984 additions & 4099 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎apps/mobile/deps/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
The Enriched Markdown tarball comes from Julius's [`fork/t3-mobile` branch](https://github.com/pingdotgg/enriched-markdown/tree/fork/t3-mobile). Its `t3-fork.json` records the exact source commit and upstream base. React block renderers, signed image sources, the `onLinksChange` link list (`renderers`, `resolveImageSource`, `onLinksChange`) and the iOS streaming memory bounds are upstream. The fork carries only changes with an open upstream PR: clipboard link metadata ([#962](https://github.com/software-mansion/enriched-markdown/pull/962)), development-host autolinks ([#961](https://github.com/software-mansion/enriched-markdown/pull/961)) and hash-route link fragments ([mity/md4c#454](https://github.com/mity/md4c/pull/454), arriving through [md4c#7](https://github.com/software-mansion-labs/md4c/pull/7)), `md4cFlags.preserveWindowsPaths`, which keeps backslashes in Windows drive paths in prose ([#1105](https://github.com/software-mansion/enriched-markdown/pull/1105), after [mity/md4c#477](https://github.com/mity/md4c/pull/477)), GitHub's strikethrough rules for `~` ([md4c#6](https://github.com/software-mansion-labs/md4c/pull/6)), `\(…\)` and `\[…\]` math delimiters ([#1043](https://github.com/software-mansion/enriched-markdown/pull/1043), [md4c#4](https://github.com/software-mansion-labs/md4c/pull/4)), iOS Copy as Markdown keeping bold spans whole ([#1143](https://github.com/software-mansion/enriched-markdown/pull/1143)), and line breaks in copied table cells written as `<br>` ([#1144](https://github.com/software-mansion/enriched-markdown/pull/1144)).
1+
The Enriched Markdown tarball comes from Julius's [`fork/t3-mobile` branch](https://github.com/pingdotgg/enriched-markdown/tree/fork/t3-mobile). Its `t3-fork.json` records the exact source commit and upstream base. React block renderers, signed image sources, the `onLinksChange` link list (`renderers`, `resolveImageSource`, `onLinksChange`) and the iOS streaming memory bounds are upstream. The fork carries only changes with an open upstream PR: clipboard link metadata ([#962](https://github.com/software-mansion/enriched-markdown/pull/962)), development-host autolinks ([#961](https://github.com/software-mansion/enriched-markdown/pull/961)) and hash-route link fragments ([mity/md4c#454](https://github.com/mity/md4c/pull/454), arriving through [md4c#7](https://github.com/software-mansion-labs/md4c/pull/7)), `md4cFlags.preserveWindowsPaths`, which keeps backslashes in Windows drive paths in prose ([#1105](https://github.com/software-mansion/enriched-markdown/pull/1105), after [mity/md4c#477](https://github.com/mity/md4c/pull/477)), GitHub's strikethrough rules for `~` ([md4c#6](https://github.com/software-mansion-labs/md4c/pull/6)), `\(…\)` and `\[…\]` math delimiters ([#1043](https://github.com/software-mansion/enriched-markdown/pull/1043), [md4c#4](https://github.com/software-mansion-labs/md4c/pull/4)), iOS Copy as Markdown keeping bold spans whole ([#1143](https://github.com/software-mansion/enriched-markdown/pull/1143)), line breaks in copied table cells written as `<br>` ([#1144](https://github.com/software-mansion/enriched-markdown/pull/1144)), and Android measuring text in the span order its view draws it, so code blocks nested in list items no longer make a reply overlap the next message ([#1145](https://github.com/software-mansion/enriched-markdown/pull/1145)).
22

33
To replace it, commit the fork changes, run `yarn install --immutable` and `yarn workspace react-native-enriched-markdown prepare` in the fork checkout, then `node scripts/pack-t3.mjs /path/to/t3code/apps/mobile/deps`. Keep the package version aligned with Julius's `fork/t3-mobile` branch. Rename the archive to include the first eight characters of the source commit, such as `react-native-enriched-markdown-1.2.0-t3.18-4287c5d3.tgz`, so each build has a distinct dependency path without version bumps. Update the tarball path in `apps/mobile/package.json` and `pnpm-workspace.yaml`'s `allowBuilds`, and run `vp i` to update the lockfile. Native clients need rebuilding when this dependency changes.
44

Binary file not shown.
Binary file not shown.

‎apps/mobile/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@
122122
"react-dom": "catalog:",
123123
"react-native": "0.88.0",
124124
"react-native-blob-util": "0.25.1",
125-
"react-native-enriched-markdown": "file:deps/react-native-enriched-markdown-1.2.0-t3.18-4287c5d3.tgz",
125+
"react-native-enriched-markdown": "file:deps/react-native-enriched-markdown-1.2.0-t3.18-497fbe63.tgz",
126126
"react-native-gesture-handler": "~3.3.0",
127127
"react-native-image-viewing": "^0.2.2",
128128
"react-native-keyboard-controller": "1.22.8",

‎apps/mobile/src/components/ui/useBarInset.ts‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,13 @@ export function useContentTopInset(): number {
4848
return Platform.OS === "ios" ? (columnMetrics?.safeArea.top ?? insets.top) : 0;
4949
}
5050

51+
/** The content's bottom safe area on iOS, which a list with manual insets must add itself. */
52+
export function useContentBottomInset(): number {
53+
const insets = useSafeAreaInsets();
54+
const columnMetrics = useNativeColumnLayoutMetrics();
55+
return Platform.OS === "ios" ? (columnMetrics?.safeArea.bottom ?? insets.bottom) : 0;
56+
}
57+
5158
/** How much of the screen's bottom edge an AppBar `search` covers: iOS's bottom search toolbar. */
5259
export function useSearchToolbarInset(search: AppBarSearch | undefined): number {
5360
const { layout } = useAdaptiveWorkspaceLayout();

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import { Pressable, RefreshControl, View } from "react-native";
1010
import { AppText as Text } from "../../components/ui/AppText";
1111
import { PierreEntryIcon } from "../../components/PierreEntryIcon";
1212
import { cn } from "../../lib/cn";
13-
import { useContentTopInset } from "../../components/ui/useBarInset";
13+
import { useContentBottomInset, useContentTopInset } from "../../components/ui/useBarInset";
1414
import {
1515
buildFileTree,
1616
flattenFileTree,
@@ -122,6 +122,7 @@ export function FileTreeBrowser(props: {
122122
readonly selectedPathAtPress: string | null;
123123
} | null>(null);
124124
const headerInset = useContentTopInset();
125+
const bottomInset = useContentBottomInset();
125126
const {
126127
onLoadDirectory,
127128
onPreviewFile,
@@ -214,12 +215,12 @@ export function FileTreeBrowser(props: {
214215
return (
215216
<LegendList
216217
renderScrollComponent={NativeScrollView}
217-
contentInsetStartAdjustment={headerInset}
218+
contentInset={{ top: headerInset, bottom: bottomInset }}
218219
alwaysBounceVertical
219220
className="flex-1"
220221
data={visibleNodes}
221222
keyExtractor={(item) => item.node.path}
222-
contentInsetAdjustmentBehavior="automatic"
223+
contentInsetAdjustmentBehavior="never"
223224
automaticallyAdjustsScrollIndicatorInsets
224225
keyboardDismissMode="on-drag"
225226
keyboardShouldPersistTaps="handled"

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

Lines changed: 76 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,14 @@ import { useLayoutEffect, useRef, useState } from "react";
66
import {
77
FlatList,
88
Platform,
9+
Pressable,
910
RefreshControl,
1011
ScrollView,
1112
Text as NativeText,
1213
useWindowDimensions,
1314
View,
1415
} from "react-native";
16+
import { WebView } from "react-native-webview";
1517
import { useSafeAreaInsets } from "react-native-safe-area-context";
1618
import { AppText as Text } from "../../components/ui/AppText";
1719
import { LoadingStrip } from "../../components/ui/LoadingStrip";
@@ -35,7 +37,11 @@ import {
3537
} from "./nativeSourceFileAdapter";
3638
import { SourceText } from "@t3tools/mobile-source-text";
3739

38-
import { boundedSelectableSourceTokens, prepareSourceFileDocument } from "./source-file-document";
40+
import {
41+
boundedSelectableSourceTokens,
42+
prepareSourceFileDocument,
43+
selectableSourceHtml,
44+
} from "./source-file-document";
3945
import { sourceHighlightAtom } from "./sourceHighlightingState";
4046
import { createSourceLineScroll } from "./source-file-scroll";
4147

@@ -46,6 +52,7 @@ interface SourceFileSurfaceProps {
4652
readonly initialLine?: number | null;
4753
readonly headerInsetTop?: number;
4854
readonly selectable?: boolean;
55+
readonly onLongPressLine?: (line: number) => void;
4956
readonly onRefresh?: () => Promise<void> | void;
5057
}
5158

@@ -58,8 +65,10 @@ const HighlightedSourceLine = function HighlightedSourceLine(props: {
5865
readonly tokens: ReadonlyArray<HighlightedToken> | null;
5966
readonly highlighted: boolean;
6067
readonly wordBreak: boolean;
68+
readonly onLongPress?: () => void;
6169
}) {
62-
return (
70+
const selectable = props.onLongPress === undefined;
71+
const row = (
6372
<View
6473
className={cn("flex-row", props.highlighted && "bg-primary/10")}
6574
style={{ minHeight: props.codeSurface.rowHeight }}
@@ -76,7 +85,7 @@ const HighlightedSourceLine = function HighlightedSourceLine(props: {
7685
{props.index + 1}
7786
</NativeText>
7887
<NativeText
79-
selectable
88+
selectable={selectable}
8089
selectionColorClassName={Platform.OS === "android" ? "accent-focus/32" : undefined}
8190
numberOfLines={props.wordBreak ? undefined : 1}
8291
className="flex-1 font-normal text-foreground"
@@ -106,7 +115,7 @@ const HighlightedSourceLine = function HighlightedSourceLine(props: {
106115
return (
107116
<NativeText
108117
key={`${start}:${token.content.length}:${token.color ?? ""}`}
109-
selectable
118+
selectable={selectable}
110119
selectionColorClassName={
111120
Platform.OS === "android" ? "accent-focus/32" : undefined
112121
}
@@ -126,6 +135,20 @@ const HighlightedSourceLine = function HighlightedSourceLine(props: {
126135
</NativeText>
127136
</View>
128137
);
138+
const onLongPress = props.onLongPress;
139+
return onLongPress ? (
140+
<Pressable
141+
onLongPress={onLongPress}
142+
accessibilityActions={[{ name: "longpress", label: "Select text" }]}
143+
onAccessibilityAction={(event) => {
144+
if (event.nativeEvent.actionName === "longpress") onLongPress();
145+
}}
146+
>
147+
{row}
148+
</Pressable>
149+
) : (
150+
row
151+
);
129152
};
130153

131154
function useSourceFileModel(props: SourceFileSurfaceProps) {
@@ -185,7 +208,7 @@ function NativeSourceFileSurface(
185208
readonly NativeView: ComponentType<NativeReviewDiffViewProps>;
186209
},
187210
) {
188-
const { NativeView, onRefresh } = props;
211+
const { NativeView, onLongPressLine, onRefresh } = props;
189212
const insets = useSafeAreaInsets();
190213
const columnMetrics = useNativeColumnLayoutMetrics();
191214
const safeArea = columnMetrics?.safeArea ?? insets;
@@ -224,6 +247,11 @@ function NativeSourceFileSurface(
224247
styleJson={styleJson}
225248
themeJson={themeJson}
226249
tokensJson={tokensJson}
250+
onPressLine={({ nativeEvent }) => {
251+
if (nativeEvent.gesture === "longPress" && nativeEvent.newLineNumber !== undefined) {
252+
onLongPressLine?.(nativeEvent.newLineNumber);
253+
}
254+
}}
227255
{...(onRefresh
228256
? {
229257
refreshing: isPullRefreshing,
@@ -237,7 +265,8 @@ function NativeSourceFileSurface(
237265

238266
function JavaScriptSourceFileSurface(props: SourceFileSurfaceProps) {
239267
const usesAutomaticInsets = Platform.OS === "ios" && !props.embedded;
240-
const foreground = useUniwindTheme()["--color-foreground"];
268+
const appTheme = useUniwindTheme();
269+
const foreground = appTheme["--color-foreground"];
241270
const { codeSurface, codeWordBreak } = useAppearanceCodeSurface();
242271
const { normalizedContents, lines, status, targetIndex, tokens } = useSourceFileModel(props);
243272
const selectableTokens = props.selectable ? boundedSelectableSourceTokens(tokens) : null;
@@ -248,17 +277,23 @@ function JavaScriptSourceFileSurface(props: SourceFileSurfaceProps) {
248277
<RefreshControl refreshing={isPullRefreshing} onRefresh={() => void handlePullToRefresh()} />
249278
) : undefined;
250279

280+
const usesLineList = !props.selectable;
281+
// Android lays out a full selectable TextView on the UI thread, which can stall large files.
282+
const usesWebSelection = props.selectable === true && Platform.OS === "android";
283+
const usesTextSelection = props.selectable === true && !usesWebSelection;
284+
251285
// Layout effect so a pending jump is cancelled in the commit that swaps the file.
252286
// oxlint-disable-next-line t3code/no-unreasoned-state-sync -- scrolls the FlatList to the target line and cancels a pending jump when the file changes
253287
useLayoutEffect(() => {
254-
if (targetIndex === null) {
288+
if (targetIndex === null || !usesLineList) {
255289
return;
256290
}
257291
lineScroll.scrollToLine(listRef.current, targetIndex);
258292
return lineScroll.cancel;
259-
// oxlint-disable-next-line react/exhaustive-effect-dependencies -- Opening another file at the same line index scrolls the new file to it.
260-
}, [lineScroll, props.path, targetIndex]);
293+
// oxlint-disable-next-line react/exhaustive-effect-dependencies -- Opening another file at the same line index, or leaving selection mode, scrolls the remounted list to it.
294+
}, [lineScroll, props.path, targetIndex, usesLineList]);
261295

296+
const { onLongPressLine } = props;
262297
const renderLine = ({ item, index }: { item: string; index: number }) => (
263298
<HighlightedSourceLine
264299
codeSurface={codeSurface}
@@ -267,14 +302,14 @@ function JavaScriptSourceFileSurface(props: SourceFileSurfaceProps) {
267302
tokens={tokens?.[index] ?? null}
268303
highlighted={index === targetIndex}
269304
wordBreak={codeWordBreak}
305+
onLongPress={onLongPressLine ? () => onLongPressLine(index + 1) : undefined}
270306
/>
271307
);
272308

273309
// One native text view permits document-wide selection; virtualized rows cannot.
274-
const selectableBlock = props.selectable ? (
310+
const selectableBlock = usesTextSelection ? (
275311
<SourceText
276312
selectable
277-
selectionColorClassName={Platform.OS === "android" ? "accent-focus/32" : undefined}
278313
style={{
279314
color: foreground,
280315
fontFamily: REVIEW_MONO_FONT_FAMILY,
@@ -322,6 +357,33 @@ function JavaScriptSourceFileSurface(props: SourceFileSurfaceProps) {
322357
</SourceText>
323358
) : null;
324359

360+
const webSelection = usesWebSelection ? (
361+
<WebView
362+
source={{
363+
html: selectableSourceHtml(normalizedContents, {
364+
foreground,
365+
selection: appTheme["--color-focus"],
366+
fontSize: codeSurface.fontSize,
367+
rowHeight: codeSurface.rowHeight,
368+
wordBreak: codeWordBreak,
369+
}),
370+
}}
371+
originWhitelist={["*"]}
372+
// Android pastes copied HTML as styled text with collapsed whitespace, so copy plain text.
373+
// Wrapped text reflows once the WebView reaches its final width, so scroll again then.
374+
injectedJavaScript={`addEventListener("copy",(event)=>{event.clipboardData.setData("text/plain",getSelection().toString());event.preventDefault();});${
375+
targetIndex === null
376+
? ""
377+
: `const line=document.getElementById("L${targetIndex + 1}");const reveal=()=>line?.scrollIntoView({block:"center"});reveal();addEventListener("resize",reveal,{once:true});`
378+
}true;`}
379+
domStorageEnabled={false}
380+
cacheEnabled={false}
381+
setSupportMultipleWindows={false}
382+
onShouldStartLoadWithRequest={(request) => request.url === "about:blank"}
383+
style={{ flex: 1, backgroundColor: "transparent" }}
384+
/>
385+
) : null;
386+
325387
const list = (
326388
<FlatList
327389
ref={listRef}
@@ -353,7 +415,6 @@ function JavaScriptSourceFileSurface(props: SourceFileSurfaceProps) {
353415
/>
354416
);
355417

356-
const usesLineList = !props.selectable;
357418
const padded = (
358419
<ScrollView
359420
refreshControl={refreshControl}
@@ -372,7 +433,7 @@ function JavaScriptSourceFileSurface(props: SourceFileSurfaceProps) {
372433

373434
return (
374435
<View className="relative flex-1 bg-sheet">
375-
<SourceHighlightStatusView status={status} />
436+
{usesWebSelection ? null : <SourceHighlightStatusView status={status} />}
376437
{usesLineList ? (
377438
codeWordBreak ? (
378439
list
@@ -381,6 +442,8 @@ function JavaScriptSourceFileSurface(props: SourceFileSurfaceProps) {
381442
{list}
382443
</ScrollView>
383444
)
445+
) : usesWebSelection ? (
446+
webSelection
384447
) : codeWordBreak ? (
385448
padded
386449
) : (

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

Lines changed: 36 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,13 @@ import { formatFilePathForClipboard } from "@t3tools/client-runtime/media-action
22
import { resolvePathLinkTarget } from "@t3tools/shared/fileLinks";
33
import { resolveFilesystemReadAccess } from "@t3tools/client-runtime/state/filesystem";
44
import { environmentSession } from "../../state/session";
5-
import { StackActions, useNavigation, type StaticScreenProps } from "@react-navigation/native";
6-
import { type ReactNode, useId, useState } from "react";
5+
import {
6+
StackActions,
7+
useNavigation,
8+
usePreventRemove,
9+
type StaticScreenProps,
10+
} from "@react-navigation/native";
11+
import { type ComponentProps, type ReactNode, useId, useState } from "react";
712
import { Platform, View } from "react-native";
813
import Svg, { Defs, LinearGradient, Rect, Stop } from "react-native-svg";
914
import { EnvironmentId, type ProjectReadFileResult, ThreadId } from "@t3tools/contracts";
@@ -197,6 +202,33 @@ function defaultViewMode(path: string | null): FileViewMode {
197202
: "source";
198203
}
199204

205+
// Android numbered rows are separate text views, so a long-press opens the whole file as one
206+
// selectable text at that line. Back returns to the numbered rows at the same line.
207+
function FileSourceSurface(props: ComponentProps<typeof SourceFileSurface>) {
208+
const navigation = useNavigation();
209+
const [selection, setSelection] = useState<{
210+
readonly line: number;
211+
readonly active: boolean;
212+
} | null>(null);
213+
usePreventRemove(selection?.active === true, ({ data }) => {
214+
setSelection((value) => value && { ...value, active: false });
215+
// The re-dispatched action skips this guard, so "Return to chat" still leaves in one tap.
216+
if (data.action.type !== "GO_BACK" && data.action.type !== "POP") {
217+
navigation.dispatch(data.action);
218+
}
219+
});
220+
return (
221+
<SourceFileSurface
222+
{...props}
223+
initialLine={selection?.line ?? props.initialLine}
224+
selectable={selection?.active === true}
225+
onLongPressLine={
226+
Platform.OS === "android" ? (line) => setSelection({ line, active: true }) : undefined
227+
}
228+
/>
229+
);
230+
}
231+
200232
function FileContent(props: {
201233
readonly activeMode: FileViewMode;
202234
readonly cwd: string;
@@ -308,7 +340,8 @@ function FileContent(props: {
308340
onRefresh={props.onRefresh}
309341
/>
310342
) : (
311-
<SourceFileSurface
343+
<FileSourceSurface
344+
key={props.initialLine}
312345
contents={props.fileContents}
313346
path={props.relativePath}
314347
initialLine={props.initialLine}

‎apps/mobile/src/features/files/ZipArchiveView.test.tsx‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,10 @@ vi.mock("../../components/ui/AppBar", () => {
127127
}) => <div>{props.menus?.map((menu) => renderItems(menu.items))}</div>,
128128
};
129129
});
130-
vi.mock("../../components/ui/useBarInset", () => ({ useContentTopInset: () => 0 }));
130+
vi.mock("../../components/ui/useBarInset", () => ({
131+
useContentTopInset: () => 0,
132+
useContentBottomInset: () => 0,
133+
}));
131134
vi.mock("../../components/ui/AppSymbol", () => ({ SymbolView: () => null }));
132135
vi.mock("../../components/ui/Progress", () => ({ Progress: () => null }));
133136
vi.mock("../../components/PierreEntryIcon", () => ({ PierreEntryIcon: () => null }));

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import { Keyboard, Pressable, ScrollView, TextInput, View } from "react-native";
2121

2222
import { PierreEntryIcon } from "../../components/PierreEntryIcon";
2323
import { AppBar } from "../../components/ui/AppBar";
24-
import { useContentTopInset } from "../../components/ui/useBarInset";
24+
import { useContentBottomInset, useContentTopInset } from "../../components/ui/useBarInset";
2525
import { SymbolView } from "../../components/ui/AppSymbol";
2626
import { AppText as Text } from "../../components/ui/AppText";
2727
import { Button } from "../../components/ui/Button";
@@ -395,15 +395,16 @@ function ZipArchiveList(props: {
395395
return next;
396396
});
397397
const fileCount = archive.fileCount;
398+
const bottomInset = useContentBottomInset();
398399
return (
399400
<View className="flex-1 bg-sheet">
400401
<LegendList
401402
renderScrollComponent={NativeScrollView}
402-
contentInsetStartAdjustment={props.headerInset}
403+
contentInset={{ top: props.headerInset, bottom: bottomInset }}
403404
className="flex-1"
404405
data={rows}
405406
keyExtractor={(row) => `${row.node.entry ? "f" : "d"}:${row.node.path}`}
406-
contentInsetAdjustmentBehavior="automatic"
407+
contentInsetAdjustmentBehavior="never"
407408
automaticallyAdjustsScrollIndicatorInsets
408409
estimatedItemSize={44}
409410
recycleItems

0 commit comments

Comments
 (0)