The best way to control Claude Code, Codex and more from any computer or phone
Mirrored from https://github.com/Camo67/t3code.git
Synced Nov 21, 18:30 UTC
fix(mobile): Android sheets scroll without per-feature platform checks (#34207)
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Julius Marminge committed
Nov 12, 2026 at 17:41 UTC
62647f4d24fdb3e345e10a986686cdf6e1ecb199
67 files changed
+1256
-838
apps/mobile/deps/react-native-screens-5.0.0-t3.48.tgz
Binary files a/apps/mobile/deps/react-native-screens-5.0.0-t3.48.tgz and /dev/null differ
apps/mobile/deps/react-native-screens-5.0.0-t3.50.tgz
Binary files /dev/null and b/apps/mobile/deps/react-native-screens-5.0.0-t3.50.tgz differ
apps/mobile/package.json
+1
-1
@@ -134,7 +134,7 @@
134
"react-native-pdf-jsi": "6.1.0",
135
"react-native-reanimated": "4.7.1",
136
"react-native-safe-area-context": "~5.11.1",
137
- "react-native-screens": "file:deps/react-native-screens-5.0.0-t3.48.tgz",
137
+ "react-native-screens": "file:deps/react-native-screens-5.0.0-t3.50.tgz",
138
"react-native-svg": "15.16.1",
139
"react-native-webview": "14.0.1",
140
"react-native-worklets": "0.13.1",
apps/mobile/src/components/ui/AppBar.android.tsx
+4
-1
@@ -2,6 +2,7 @@ import { type RefObject, use, useRef, useState } from "react";
2
import { Keyboard, type TextInputInstance, View } from "react-native";
3
import { useHardwareBack } from "../../lib/backHandler";
4
import { useToolbarLayout } from "./useToolbarLayout";
5
+import { BottomSheetContext } from "./BottomSheetContext";
6
import { RoutedFormSheetContext } from "./RoutedFormSheetContext";
7
import { NativeStackScreenOptions } from "../../native/StackHeader";
8
import { useSidebarToggle } from "../../features/layout/useSidebarToggle";
@@ -82,12 +83,14 @@ function AppBarView(props: AppBarProps & { readonly searchState?: SearchState })
83
const inWorkspace = useHasWorkspaceAppBar();
84
const sidebarToggle = useSidebarToggle();
85
const closeInspector = use(InspectorCloseContext);
86
+ // A bottom sheet owns the pull at its top, so refresh needs a button there.
87
+ const inBottomSheet = use(BottomSheetContext);
88
const inline = search?.mode === "inline";
89
const searching = searchState?.searching === true;
90
const actions = props.refresh
91
? [
92
...(props.actions ?? []),
90
- { ...props.refresh, icon: "arrow.clockwise" as const, overflowOnly: true },
93
+ { ...props.refresh, icon: "arrow.clockwise" as const, overflowOnly: !inBottomSheet },
94
]
95
: props.actions;
96
const openSearch = () => searchState?.open();
apps/mobile/src/components/ui/AppBar.types.ts
+4
-1
@@ -78,7 +78,10 @@ export interface AppBarProps {
78
readonly titleContent?: ReactNode;
79
readonly subtitle?: string | null;
80
readonly actions?: ReadonlyArray<AppBarAction>;
81
- /** Pull-to-refresh is the gesture on both platforms; Android also lists this in the overflow menu. */
81
+ /**
82
+ * Pull-to-refresh is the gesture on both platforms. Android also lists this in the overflow
83
+ * menu, or shows it as a button in a bottom sheet, where the sheet owns the pull.
84
+ */
85
readonly refresh?: Pick<AppBarAction, "accessibilityLabel" | "disabled" | "onPress">;
86
readonly menus?: ReadonlyArray<AppBarMenu>;
87
readonly search?: AppBarSearch;
apps/mobile/src/components/ui/BottomSheetContext.ts
new
+4
@@ -0,0 +1,4 @@
1
+import { createContext } from "react";
2
+
3
+/** True inside a draggable bottom sheet, which owns the downward drag at the top of its content. */
4
+export const BottomSheetContext = createContext(false);
apps/mobile/src/components/ui/ContentBand.android.tsx
new
+46
@@ -0,0 +1,46 @@
1
+import { View } from "react-native";
2
+
3
+import { cn } from "../../lib/cn";
4
+import { AppActivityIndicator } from "./AppActivityIndicator";
5
+import { AppText as Text } from "./AppText";
6
+import type { ContentBandProps, ContentStatusProps } from "./ContentBand.types";
7
+export type { ContentBandProps, ContentStatusProps } from "./ContentBand.types";
8
+
9
+/** A rounded card floating in the content's margin. */
10
+export function ContentBand(props: ContentBandProps) {
11
+ return (
12
+ <View
13
+ className={cn(
14
+ "m-2 rounded-[20px] px-4",
15
+ props.spacing === "roomy" ? "gap-3 py-4" : "py-3",
16
+ props.tone === "warning" ? "bg-warning" : "bg-card",
17
+ )}
18
+ >
19
+ {props.children}
20
+ </View>
21
+ );
22
+}
23
+
24
+/** Material centers an empty state in the space it has. */
25
+export function ContentStatus(props: ContentStatusProps) {
26
+ if (props.loading) {
27
+ return (
28
+ <View className="items-center gap-3 px-4 py-6">
29
+ <AppActivityIndicator size="small" />
30
+ <Text className="text-xs text-foreground-muted">{props.detail}</Text>
31
+ </View>
32
+ );
33
+ }
34
+ return (
35
+ <View className="items-center px-6 py-5">
36
+ {props.title ? (
37
+ <Text className="text-sm font-t3-bold text-foreground">{props.title}</Text>
38
+ ) : null}
39
+ <Text className="mt-2 text-center text-xs leading-normal text-foreground-muted">
40
+ {props.detail}
41
+ </Text>
42
+ </View>
43
+ );
44
+}
45
+
46
+export const contentStatusContainerStyle = { flexGrow: 1, justifyContent: "center" } as const;
apps/mobile/src/components/ui/ContentBand.tsx
new
+44
@@ -0,0 +1,44 @@
1
+import { View } from "react-native";
2
+
3
+import { cn } from "../../lib/cn";
4
+import { AppActivityIndicator } from "./AppActivityIndicator";
5
+import { AppText as Text } from "./AppText";
6
+import type { ContentBandProps, ContentStatusProps } from "./ContentBand.types";
7
+export type { ContentBandProps, ContentStatusProps } from "./ContentBand.types";
8
+
9
+/** A full-width band above or in place of content, ruled off from what follows. */
10
+export function ContentBand(props: ContentBandProps) {
11
+ return (
12
+ <View
13
+ className={cn(
14
+ "border-b px-4",
15
+ props.spacing === "roomy" ? "gap-3 py-4" : "py-3",
16
+ props.tone === "warning" ? "border-warning-border bg-warning" : "border-border bg-card",
17
+ )}
18
+ >
19
+ {props.children}
20
+ </View>
21
+ );
22
+}
23
+
24
+export function ContentStatus(props: ContentStatusProps) {
25
+ if (props.loading) {
26
+ return (
27
+ <View className="items-center gap-3 border-b border-border bg-card px-4 py-6">
28
+ <AppActivityIndicator size="small" />
29
+ <Text className="text-xs text-foreground-muted">{props.detail}</Text>
30
+ </View>
31
+ );
32
+ }
33
+ return (
34
+ <View className="border-b border-border bg-card px-4 py-5">
35
+ {props.title ? (
36
+ <Text className="text-sm font-t3-bold text-foreground">{props.title}</Text>
37
+ ) : null}
38
+ <Text className="text-xs leading-normal text-foreground-muted">{props.detail}</Text>
39
+ </View>
40
+ );
41
+}
42
+
43
+/** The scroll content style for a ContentStatus with nothing else in the scroll view. */
44
+export const contentStatusContainerStyle = undefined;
apps/mobile/src/components/ui/ContentBand.types.ts
new
+15
@@ -0,0 +1,15 @@
1
+import type { ReactNode } from "react";
2
+
3
+export interface ContentBandProps {
4
+ readonly tone?: "card" | "warning";
5
+ /** "roomy" for a band holding a block of content, such as a raw patch. */
6
+ readonly spacing?: "compact" | "roomy";
7
+ readonly children: ReactNode;
8
+}
9
+
10
+/** A status at the top of otherwise empty content, such as "No changes" or a loading diff. */
11
+export interface ContentStatusProps {
12
+ readonly title?: string;
13
+ readonly detail: string;
14
+ readonly loading?: boolean;
15
+}
apps/mobile/src/components/ui/FitSheet.android.tsx
new
+74
@@ -0,0 +1,74 @@
1
+import type { ReactNode } from "react";
2
+import { ScrollView, useWindowDimensions, View } from "react-native";
3
+import { KeyboardAvoidingView } from "react-native-keyboard-controller";
4
+import { useSafeAreaInsets } from "react-native-safe-area-context";
5
+
6
+import { fitSheetBottomInset, type FitSheetProps } from "./FitSheet.types";
7
+import { ScreenContent } from "./ScreenContent";
8
+export type { FitSheetProps } from "./FitSheet.types";
9
+
10
+/** The route sizes the sheet to this content, so the column shrinks to fit and stops short of the top. */
11
+export function FitSheet({
12
+ header,
13
+ footer,
14
+ avoidsKeyboard,
15
+ children,
16
+ contentContainerClassName = "gap-2 p-2",
17
+ contentContainerStyle,
18
+ ...scrollProps
19
+}: FitSheetProps) {
20
+ const insets = useSafeAreaInsets();
21
+ return (
22
+ // Material sheet drags follow the first nested-scrolling native view, and a header's
23
+ // Compose button is one, so the content renders first in a reversed column.
24
+ <SheetContainer avoidsKeyboard={avoidsKeyboard}>
25
+ <ScreenContent fitToContents>
26
+ <ScrollView
27
+ {...scrollProps}
28
+ nestedScrollEnabled
29
+ contentContainerClassName={contentContainerClassName}
30
+ className="shrink grow-0"
31
+ contentContainerStyle={[
32
+ footer ? undefined : { paddingBottom: fitSheetBottomInset(insets.bottom) },
33
+ contentContainerStyle,
34
+ ]}
35
+ >
36
+ {children}
37
+ {/* Partial-height sheets keep submit actions inside the scrolling form. */}
38
+ {footer ? (
39
+ <View
40
+ className="mt-4 bg-sheet-solid pt-3"
41
+ style={{ paddingBottom: Math.max(insets.bottom, 16) }}
42
+ >
43
+ <View style={{ minHeight: 48 }}>{footer}</View>
44
+ </View>
45
+ ) : null}
46
+ </ScrollView>
47
+ </ScreenContent>
48
+ {header}
49
+ </SheetContainer>
50
+ );
51
+}
52
+
53
+function SheetContainer(props: {
54
+ readonly avoidsKeyboard?: boolean;
55
+ readonly children: ReactNode;
56
+}) {
57
+ const { height } = useWindowDimensions();
58
+ const style = { maxHeight: height * 0.92 };
59
+ return props.avoidsKeyboard ? (
60
+ <KeyboardAvoidingView
61
+ automaticOffset
62
+ behavior="padding"
63
+ collapsable={false}
64
+ className="flex-col-reverse bg-sheet"
65
+ style={style}
66
+ >
67
+ {props.children}
68
+ </KeyboardAvoidingView>
69
+ ) : (
70
+ <View collapsable={false} className="flex-col-reverse bg-sheet" style={style}>
71
+ {props.children}
72
+ </View>
73
+ );
74
+}
apps/mobile/src/components/ui/FitSheet.tsx
new
+68
@@ -0,0 +1,68 @@
1
+import type { ReactNode } from "react";
2
+import { ScrollView, View } from "react-native";
3
+import { KeyboardAvoidingView } from "react-native-keyboard-controller";
4
+import { useSafeAreaInsets } from "react-native-safe-area-context";
5
+
6
+import { fitSheetBottomInset, type FitSheetProps } from "./FitSheet.types";
7
+import { ScreenContent } from "./ScreenContent";
8
+export type { FitSheetProps } from "./FitSheet.types";
9
+
10
+export function FitSheet({
11
+ header,
12
+ footer,
13
+ avoidsKeyboard,
14
+ children,
15
+ contentContainerClassName = "gap-4 px-5 pt-2",
16
+ contentContainerStyle,
17
+ ...scrollProps
18
+}: FitSheetProps) {
19
+ const insets = useSafeAreaInsets();
20
+ return (
21
+ <SheetContainer avoidsKeyboard={avoidsKeyboard}>
22
+ {header}
23
+ <ScreenContent>
24
+ <ScrollView
25
+ {...scrollProps}
26
+ nestedScrollEnabled
27
+ contentContainerClassName={contentContainerClassName}
28
+ contentInsetAdjustmentBehavior="automatic"
29
+ className="flex-1"
30
+ contentContainerStyle={[
31
+ footer ? undefined : { paddingBottom: fitSheetBottomInset(insets.bottom) },
32
+ contentContainerStyle,
33
+ ]}
34
+ >
35
+ {children}
36
+ </ScrollView>
37
+ {footer ? (
38
+ <View
39
+ className="bg-sheet px-4 pt-3"
40
+ style={{ paddingBottom: Math.max(insets.bottom, 16) }}
41
+ >
42
+ {footer}
43
+ </View>
44
+ ) : null}
45
+ </ScreenContent>
46
+ </SheetContainer>
47
+ );
48
+}
49
+
50
+function SheetContainer(props: {
51
+ readonly avoidsKeyboard?: boolean;
52
+ readonly children: ReactNode;
53
+}) {
54
+ return props.avoidsKeyboard ? (
55
+ <KeyboardAvoidingView
56
+ automaticOffset
57
+ behavior="padding"
58
+ collapsable={false}
59
+ className="flex-1 bg-sheet"
60
+ >
61
+ {props.children}
62
+ </KeyboardAvoidingView>
63
+ ) : (
64
+ <View collapsable={false} className="flex-1 bg-sheet">
65
+ {props.children}
66
+ </View>
67
+ );
68
+}
apps/mobile/src/components/ui/FitSheet.types.ts
new
+17
@@ -0,0 +1,17 @@
1
+import type { ReactNode } from "react";
2
+import type { ScrollViewProps } from "react-native";
3
+
4
+/** The body of a `sheetRoute({ androidFit: true })` screen: a header over one scrolling form. */
5
+export interface FitSheetProps extends Omit<
6
+ ScrollViewProps,
7
+ "children" | "className" | "nestedScrollEnabled" | "contentInsetAdjustmentBehavior"
8
+> {
9
+ readonly header: ReactNode;
10
+ readonly children: ReactNode;
11
+ /** Submit actions, kept reachable below the form. */
12
+ readonly footer?: ReactNode;
13
+ /** Lifts the sheet above the keyboard, for forms whose inputs sit low. */
14
+ readonly avoidsKeyboard?: boolean;
15
+}
16
+
17
+export const fitSheetBottomInset = (bottom: number) => Math.max(bottom, 18) + 18;
apps/mobile/src/components/ui/FormSection.android.tsx
new
+23
@@ -0,0 +1,23 @@
1
+import { View } from "react-native";
2
+
3
+import { AppText as Text, AppTextInput as TextInput } from "./AppText";
4
+import type { FormFieldProps, FormSectionProps } from "./FormSection.types";
5
+export type { FormFieldProps, FormSectionProps } from "./FormSection.types";
6
+
7
+export function FormSection(props: FormSectionProps) {
8
+ return (
9
+ <View className="gap-3 rounded-[20px] bg-card p-4">
10
+ <Text className="text-base font-t3-medium text-foreground">{props.title}</Text>
11
+ {props.children}
12
+ </View>
13
+ );
14
+}
15
+
16
+export function FormField({ label, ...props }: FormFieldProps) {
17
+ return (
18
+ <>
19
+ {label ? <Text className="text-sm text-foreground-secondary">{label}</Text> : null}
20
+ <TextInput {...props} className="rounded-xl bg-sheet-solid" />
21
+ </>
22
+ );
23
+}
apps/mobile/src/components/ui/FormSection.tsx
new
+20
@@ -0,0 +1,20 @@
1
+import { View } from "react-native";
2
+
3
+import { AppText as Text, AppTextInput as TextInput } from "./AppText";
4
+import type { FormFieldProps, FormSectionProps } from "./FormSection.types";
5
+export type { FormFieldProps, FormSectionProps } from "./FormSection.types";
6
+
7
+export function FormSection(props: FormSectionProps) {
8
+ return (
9
+ <View className="gap-2 rounded-[18px] border border-border bg-card p-4">
10
+ <Text className="text-2xs font-t3-bold tracking-[1px] uppercase text-foreground-secondary">
11
+ {props.title}
12
+ </Text>
13
+ {props.children}
14
+ </View>
15
+ );
16
+}
17
+
18
+export function FormField({ label: _label, ...props }: FormFieldProps) {
19
+ return <TextInput {...props} className="rounded-[18px]" />;
20
+}
apps/mobile/src/components/ui/FormSection.types.ts
new
+15
@@ -0,0 +1,15 @@
1
+import type { ReactNode } from "react";
2
+
3
+import type { AppTextInputProps } from "./AppText";
4
+
5
+/** A titled card holding a short form: its fields and the action that submits them. */
6
+export interface FormSectionProps {
7
+ readonly title: string;
8
+ readonly children: ReactNode;
9
+}
10
+
11
+export interface FormFieldProps extends Omit<AppTextInputProps, "className"> {
12
+ /** Shown where the platform labels fields; the placeholder carries it elsewhere. */
13
+ readonly label?: string;
14
+ readonly accessibilityLabel: string;
15
+}
apps/mobile/src/components/ui/KeyboardSheetBody.android.tsx
new
+41
@@ -0,0 +1,41 @@
1
+import { View } from "react-native";
2
+import { KeyboardAvoidingView, KeyboardStickyView } from "react-native-keyboard-controller";
3
+import { useSafeAreaInsets } from "react-native-safe-area-context";
4
+
5
+import type { KeyboardSheetBodyProps } from "./KeyboardSheetBody.types";
6
+export type { KeyboardSheetBodyProps } from "./KeyboardSheetBody.types";
7
+
8
+const TOOLBAR_CLEARANCE = 72;
9
+
10
+/** The toolbar sticks to the keyboard on its own, over the body's bottom edge. */
11
+export function KeyboardSheetBody(props: KeyboardSheetBodyProps) {
12
+ const insets = useSafeAreaInsets();
13
+ return (
14
+ <>
15
+ <KeyboardAvoidingView automaticOffset behavior="padding" className="flex-1">
16
+ <View
17
+ className="flex-1 px-5"
18
+ style={{
19
+ paddingTop: 8,
20
+ paddingBottom: props.toolbar ? TOOLBAR_CLEARANCE : Math.max(insets.bottom, 18),
21
+ }}
22
+ >
23
+ {props.children}
24
+ </View>
25
+ </KeyboardAvoidingView>
26
+ {props.toolbar ? (
27
+ <KeyboardStickyView
28
+ className="absolute inset-x-0 bottom-0"
29
+ offset={{ closed: 0, opened: 0 }}
30
+ >
31
+ <View
32
+ className="flex-row items-center gap-3 border-t border-border bg-sheet px-5 pt-2"
33
+ style={{ paddingBottom: Math.max(insets.bottom, 10) }}
34
+ >
35
+ {props.toolbar}
36
+ </View>
37
+ </KeyboardStickyView>
38
+ ) : null}
39
+ </>
40
+ );
41
+}
apps/mobile/src/components/ui/KeyboardSheetBody.tsx
new
+30
@@ -0,0 +1,30 @@
1
+import { View } from "react-native";
2
+import { KeyboardAvoidingView } from "react-native-keyboard-controller";
3
+import { useSafeAreaInsets } from "react-native-safe-area-context";
4
+
5
+import type { KeyboardSheetBodyProps } from "./KeyboardSheetBody.types";
6
+import { useBarOverlap } from "./useBarInset";
7
+export type { KeyboardSheetBodyProps } from "./KeyboardSheetBody.types";
8
+
9
+/** A sheet's body that stays above the keyboard, with its toolbar between the two. */
10
+export function KeyboardSheetBody(props: KeyboardSheetBodyProps) {
11
+ const insets = useSafeAreaInsets();
12
+ // The sheet's glass bar floats over its content, and only scroll views inset for it on their own.
13
+ const barOverlap = useBarOverlap();
14
+ return (
15
+ <KeyboardAvoidingView automaticOffset behavior="padding" className="flex-1">
16
+ <View
17
+ className="flex-1 px-5"
18
+ style={{
19
+ paddingTop: barOverlap + 8,
20
+ paddingBottom: props.toolbar ? 0 : Math.max(insets.bottom, 18),
21
+ }}
22
+ >
23
+ {props.children}
24
+ </View>
25
+ {props.toolbar ? (
26
+ <View className="flex-row items-center gap-3 bg-sheet px-5 py-2">{props.toolbar}</View>
27
+ ) : null}
28
+ </KeyboardAvoidingView>
29
+ );
30
+}
apps/mobile/src/components/ui/KeyboardSheetBody.types.ts
new
+7
@@ -0,0 +1,7 @@
1
+import type { ReactNode } from "react";
2
+
3
+export interface KeyboardSheetBodyProps {
4
+ readonly children: ReactNode;
5
+ /** A row of actions that rides the keyboard, such as attach and send. */
6
+ readonly toolbar?: ReactNode;
7
+}
apps/mobile/src/components/ui/PaneListItem.android.tsx
new
+21
@@ -0,0 +1,21 @@
1
+import { Pressable } from "react-native";
2
+
3
+import { cn } from "../../lib/cn";
4
+import type { PaneListItemProps } from "./PaneListItem.types";
5
+export type { PaneListItemProps } from "./PaneListItem.types";
6
+
7
+export function PaneListItem(props: PaneListItemProps) {
8
+ return (
9
+ <Pressable
10
+ accessibilityRole="button"
11
+ accessibilityState={{ selected: props.selected }}
12
+ className={cn(
13
+ "mt-1 min-h-12 justify-center rounded-[20px] px-3 py-2 active:bg-subtle",
14
+ props.selected && "bg-subtle-strong",
15
+ )}
16
+ onPress={props.onPress}
17
+ >
18
+ {props.children}
19
+ </Pressable>
20
+ );
21
+}
apps/mobile/src/components/ui/PaneListItem.tsx
new
+22
@@ -0,0 +1,22 @@
1
+import { Pressable } from "react-native";
2
+
3
+import type { PaneListItemProps } from "./PaneListItem.types";
4
+export type { PaneListItemProps } from "./PaneListItem.types";
5
+
6
+/** A selectable entry in a pane's navigation list, such as a changed file. */
7
+export function PaneListItem(props: PaneListItemProps) {
8
+ return (
9
+ <Pressable
10
+ accessibilityRole="button"
11
+ accessibilityState={{ selected: props.selected }}
12
+ className={
13
+ props.selected
14
+ ? "mt-1 min-h-12 justify-center rounded-xl bg-subtle-strong px-3 py-2"
15
+ : "mt-1 min-h-12 justify-center rounded-xl px-3 py-2 active:bg-subtle"
16
+ }
17
+ onPress={props.onPress}
18
+ >
19
+ {props.children}
20
+ </Pressable>
21
+ );
22
+}
apps/mobile/src/components/ui/PaneListItem.types.ts
new
+7
@@ -0,0 +1,7 @@
1
+import type { ReactNode } from "react";
2
+
3
+export interface PaneListItemProps {
4
+ readonly selected: boolean;
5
+ readonly onPress: () => void;
6
+ readonly children: ReactNode;
7
+}
apps/mobile/src/components/ui/PaneSheet.android.tsx
new
+26
@@ -0,0 +1,26 @@
1
+import { View } from "react-native";
2
+import { FormSheet } from "react-native-screens";
3
+import { useResolveClassNames } from "uniwind";
4
+
5
+import { BottomSheetContext } from "./BottomSheetContext";
6
+import type { PaneSheetProps } from "./PaneSheet.types";
7
+export type { PaneSheetProps } from "./PaneSheet.types";
8
+
9
+/** A native sheet holding a pane that draws its own bar, which runs up under the drawn grabber. */
10
+export function PaneSheet({ children, ...props }: PaneSheetProps) {
11
+ const containerStyle = useResolveClassNames("bg-header");
12
+ return (
13
+ <FormSheet {...props} preferredCornerRadius={28} nativeContainerStyle={containerStyle}>
14
+ <BottomSheetContext value>
15
+ {/* Android FormSheet does not bound flex children. */}
16
+ <View collapsable={false} className="absolute inset-0 bg-header pt-3">
17
+ {children}
18
+ <View
19
+ pointerEvents="none"
20
+ className="absolute top-1 h-1 w-8 self-center rounded-full bg-header-foreground/40"
21
+ />
22
+ </View>
23
+ </BottomSheetContext>
24
+ </FormSheet>
25
+ );
26
+}
apps/mobile/src/components/ui/PaneSheet.tsx
new
+21
@@ -0,0 +1,21 @@
1
+import { View } from "react-native";
2
+import { FormSheet } from "react-native-screens";
3
+import { useResolveClassNames } from "uniwind";
4
+
5
+import { BottomSheetContext } from "./BottomSheetContext";
6
+import type { PaneSheetProps } from "./PaneSheet.types";
7
+export type { PaneSheetProps } from "./PaneSheet.types";
8
+
9
+/** A native sheet holding a pane that draws its own bar. */
10
+export function PaneSheet({ children, ...props }: PaneSheetProps) {
11
+ const containerStyle = useResolveClassNames("bg-sheet");
12
+ return (
13
+ <FormSheet {...props} prefersGrabberVisible nativeContainerStyle={containerStyle}>
14
+ <BottomSheetContext value>
15
+ <View collapsable={false} className="flex-1 bg-sheet">
16
+ {children}
17
+ </View>
18
+ </BottomSheetContext>
19
+ </FormSheet>
20
+ );
21
+}
apps/mobile/src/components/ui/PaneSheet.types.ts
new
+7
@@ -0,0 +1,7 @@
1
+import type { ComponentProps } from "react";
2
+import type { FormSheet } from "react-native-screens";
3
+
4
+export type PaneSheetProps = Omit<
5
+ ComponentProps<typeof FormSheet>,
6
+ "prefersGrabberVisible" | "preferredCornerRadius" | "nativeContainerStyle"
7
+>;
apps/mobile/src/components/ui/RefreshControl.android.tsx
new
+22
@@ -0,0 +1,22 @@
1
+import { use } from "react";
2
+// oxlint-disable-next-line eslint/no-restricted-imports -- The wrapper every screen must use.
3
+import { RefreshControl as NativeRefreshControl } from "react-native";
4
+import { View, type RefreshControlProps } from "react-native";
5
+
6
+import { BottomSheetContext } from "./BottomSheetContext";
7
+
8
+/**
9
+ * A bottom sheet takes the pull at the top, and Material reads the swipe-refresh layout as unable
10
+ * to scroll up, so the sheet collapses instead of scrolling back. Sheets get a plain wrapper that
11
+ * keeps the layout style the scroll view hands its refresh control.
12
+ */
13
+export function RefreshControl(props: RefreshControlProps) {
14
+ if (use(BottomSheetContext)) {
15
+ return (
16
+ <View collapsable={false} style={props.style}>
17
+ {props.children}
18
+ </View>
19
+ );
20
+ }
21
+ return <NativeRefreshControl {...props} />;
22
+}
apps/mobile/src/components/ui/RefreshControl.tsx
new
+2
@@ -0,0 +1,2 @@
1
+// oxlint-disable-next-line eslint/no-restricted-imports -- The wrapper every screen must use.
2
+export { RefreshControl } from "react-native";
apps/mobile/src/components/ui/Sheet.android.tsx
+19
-16
@@ -3,6 +3,7 @@ import { View } from "react-native";
3
import { FormSheet } from "react-native-screens";
4
import { useResolveClassNames } from "uniwind";
5
import { AppBar } from "./AppBar";
6
+import { BottomSheetContext } from "./BottomSheetContext";
7
import { RoutedFormSheetContext } from "./RoutedFormSheetContext";
8
import { ScreenContent } from "./ScreenContent";
9
import type { SheetProps } from "./Sheet.types";
@@ -21,22 +22,24 @@ export function Sheet(props: SheetProps) {
22
onDismiss={props.onClose}
23
onNativeDismiss={props.onClose}
24
>
24
- <RoutedFormSheetContext value={false}>
25
- {/* Android FormSheet does not bound flex children. Material drags target the first scroll view, so place content before the header. */}
26
- <View collapsable={false} className="absolute inset-0 flex-col-reverse bg-header">
27
- <ScreenContent>{props.children}</ScreenContent>
28
- <AppBar
29
- sheet
30
- title={props.title}
31
- onBack={props.dismissDisabled ? undefined : () => setIsOpen(false)}
32
- hideBottomBorder
33
- />
34
- <View
35
- pointerEvents="none"
36
- className="absolute top-1 h-1 w-8 self-center rounded-full bg-header-foreground/40"
37
- />
38
- </View>
39
- </RoutedFormSheetContext>
25
+ <BottomSheetContext value>
26
+ <RoutedFormSheetContext value={false}>
27
+ {/* Android FormSheet does not bound flex children. */}
28
+ <View collapsable={false} className="absolute inset-0 bg-header">
29
+ <AppBar
30
+ sheet
31
+ title={props.title}
32
+ onBack={props.dismissDisabled ? undefined : () => setIsOpen(false)}
33
+ hideBottomBorder
34
+ />
35
+ <ScreenContent>{props.children}</ScreenContent>
36
+ <View
37
+ pointerEvents="none"
38
+ className="absolute top-1 h-1 w-8 self-center rounded-full bg-header-foreground/40"
39
+ />
40
+ </View>
41
+ </RoutedFormSheetContext>
42
+ </BottomSheetContext>
43
</FormSheet>
44
);
45
}
apps/mobile/src/components/ui/SheetIntro.android.tsx
new
+17
@@ -0,0 +1,17 @@
1
+import { View } from "react-native";
2
+
3
+import { AppText as Text } from "./AppText";
4
+import type { SheetIntroProps } from "./SheetIntro.types";
5
+export type { SheetIntroProps } from "./SheetIntro.types";
6
+
7
+/** Material sheets lead with the question itself, so the eyebrow is left out. */
8
+export function SheetIntro(props: SheetIntroProps) {
9
+ return (
10
+ <View className="gap-2 rounded-[20px] bg-card p-3">
11
+ <Text className="text-xl font-t3-medium">{props.title}</Text>
12
+ <Text className="text-base leading-normal text-foreground-secondary">
13
+ {props.description}
14
+ </Text>
15
+ </View>
16
+ );
17
+}
apps/mobile/src/components/ui/SheetIntro.tsx
new
+21
@@ -0,0 +1,21 @@
1
+import { View } from "react-native";
2
+
3
+import { AppText as Text } from "./AppText";
4
+import type { SheetIntroProps } from "./SheetIntro.types";
5
+export type { SheetIntroProps } from "./SheetIntro.types";
6
+
7
+export function SheetIntro(props: SheetIntroProps) {
8
+ return (
9
+ <View className="items-center gap-1 pt-2 pb-1">
10
+ {props.eyebrow ? (
11
+ <Text className="text-xs font-t3-bold tracking-[1px] uppercase text-foreground-muted">
12
+ {props.eyebrow}
13
+ </Text>
14
+ ) : null}
15
+ <Text className="text-center text-3xl font-t3-bold">{props.title}</Text>
16
+ <Text className="text-center text-sm font-medium leading-normal text-foreground-secondary">
17
+ {props.description}
18
+ </Text>
19
+ </View>
20
+ );
21
+}
apps/mobile/src/components/ui/SheetIntro.types.ts
new
+7
@@ -0,0 +1,7 @@
1
+/** The lead of a decision sheet: what is being asked, above the choices. */
2
+export interface SheetIntroProps {
3
+ /** A short kicker such as "Confirm", where the platform uses one. */
4
+ readonly eyebrow?: string;
5
+ readonly title: string;
6
+ readonly description: string;
7
+}
apps/mobile/src/components/ui/SheetPane.android.tsx
new
+13
@@ -0,0 +1,13 @@
1
+import { View } from "react-native";
2
+
3
+import type { SheetPaneProps } from "./SheetPane.types";
4
+export type { SheetPaneProps } from "./SheetPane.types";
5
+
6
+/** The root of a pane or sheet: the bar's color, so ScreenContent's card reads as set into it. */
7
+export function SheetPane(props: SheetPaneProps) {
8
+ return (
9
+ <View collapsable={false} className="flex-1 bg-header">
10
+ {props.children}
11
+ </View>
12
+ );
13
+}
apps/mobile/src/components/ui/SheetPane.tsx
new
+16
@@ -0,0 +1,16 @@
1
+import { View } from "react-native";
2
+
3
+import type { SheetPaneProps } from "./SheetPane.types";
4
+export type { SheetPaneProps } from "./SheetPane.types";
5
+
6
+/** The root of a pane or sheet that draws an AppBar above its ScreenContent. */
7
+export function SheetPane(props: SheetPaneProps) {
8
+ return (
9
+ <View
10
+ collapsable={false}
11
+ className={props.surface === "screen" ? "flex-1 bg-screen" : "flex-1 bg-sheet"}
12
+ >
13
+ {props.children}
14
+ </View>
15
+ );
16
+}
apps/mobile/src/components/ui/SheetPane.types.ts
new
+7
@@ -0,0 +1,7 @@
1
+import type { ReactNode } from "react";
2
+
3
+export interface SheetPaneProps {
4
+ /** The iOS surface under the bar: a sheet's, or the screen's where the pane sits in a column. */
5
+ readonly surface?: "sheet" | "screen";
6
+ readonly children: ReactNode;
7
+}
apps/mobile/src/components/ui/listMetrics.android.ts
new
+10
@@ -0,0 +1,10 @@
1
+/** Material's 48dp touch target and 56dp one-line list item. */
2
+export const ROW_MIN_HEIGHT = { control: 48, item: 56 } as const;
3
+
4
+/** Android sheets span the window, so a list stops at a readable width on a tablet or fold. */
5
+export const READABLE_WIDTH_STYLE = { width: "100%", maxWidth: 720, alignSelf: "center" } as const;
6
+
7
+/** Sections are cards with their own padding, set close in from ScreenContent's edges. */
8
+export function groupedListInsets(_inInspector: boolean) {
9
+ return { paddingHorizontal: 8, gap: 8 };
10
+}
apps/mobile/src/components/ui/listMetrics.ts
new
+10
@@ -0,0 +1,10 @@
1
+/** Minimum heights of tappable rows: a header control, and a list item. */
2
+export const ROW_MIN_HEIGHT = { control: 44, item: 44 } as const;
3
+
4
+/** Keeps a list at a readable width. iOS sheets and columns already bound it. */
5
+export const READABLE_WIDTH_STYLE = undefined;
6
+
7
+/** Insets for a scroll view of grouped list sections. */
8
+export function groupedListInsets(inInspector: boolean) {
9
+ return { paddingHorizontal: inInspector ? 12 : 20, gap: 14 };
10
+}
apps/mobile/src/components/ui/useBarInset.ts
+15
@@ -65,3 +65,18 @@ export function useSearchToolbarInset(search: AppBarSearch | undefined): number
65
? NATIVE_MAIL_SEARCH_TOOLBAR_CONTENT_INSET
66
: 0;
67
}
68
+
69
+/** Where a sheet's scrolling content ends: clear of the bottom safe area, with a little room. */
70
+export function useSheetContentBottomInset(): number {
71
+ const insets = useSafeAreaInsets();
72
+ const columnMetrics = useNativeColumnLayoutMetrics();
73
+ return Platform.OS === "ios"
74
+ ? (columnMetrics?.safeArea.bottom ?? insets.bottom) + 8
75
+ : Math.max(insets.bottom, 18) + 18;
76
+}
77
+
78
+/** The bottom safe area a list in a sheet pads itself: Android's, which its sheets don't adjust for. */
79
+export function useUnadjustedBottomInset(): number {
80
+ const insets = useSafeAreaInsets();
81
+ return Platform.OS === "android" ? insets.bottom : 0;
82
+}
apps/mobile/src/features/archive/ArchivedThreadsScreen.tsx
+2
-1
@@ -16,7 +16,8 @@ import { AppActivityIndicator } from "../../components/ui/AppActivityIndicator";
16
import { AppBar } from "../../components/ui/AppBar";
17
import { SymbolView } from "../../components/ui/AppSymbol";
18
import { useMemo, useRef, type ComponentProps } from "react";
19
-import { RefreshControl, useWindowDimensions, View } from "react-native";
19
+import { useWindowDimensions, View } from "react-native";
20
+import { RefreshControl } from "../../components/ui/RefreshControl";
21
import { GestureDetector, useNativeGesture } from "react-native-gesture-handler";
22
import type { SwipeableMethods } from "react-native-gesture-handler/ReanimatedSwipeable";
23
apps/mobile/src/features/cloud/ConnectOnboardingRouteScreen.tsx
+2
-1
@@ -5,7 +5,8 @@ import { ScreenScrollView as ScrollView } from "../../components/ui/ScreenScroll
5
import { useAuth } from "@clerk/expo";
6
import { useNavigation } from "@react-navigation/native";
7
import { useState } from "react";
8
-import { RefreshControl, View } from "react-native";
8
+import { View } from "react-native";
9
+import { RefreshControl } from "../../components/ui/RefreshControl";
10
import { useSafeAreaInsets } from "react-native-safe-area-context";
11
12
import { reportAtomCommandResult, settlePromise } from "@t3tools/client-runtime/state/runtime";
apps/mobile/src/features/cloud/T3ConnectProfilePage.tsx
+2
-1
@@ -7,7 +7,8 @@ import type { MenuAction } from "@react-native-menu/menu";
7
import type { EnvironmentId } from "@t3tools/contracts";
8
import type { RelayClientEnvironmentRecord } from "@t3tools/contracts/relay";
9
import { type ReactNode, useRef, useState } from "react";
10
-import { Pressable, RefreshControl, ScrollView, Text, View } from "react-native";
10
+import { Pressable, ScrollView, Text, View } from "react-native";
11
+import { RefreshControl } from "../../components/ui/RefreshControl";
12
13
import { AppActivityIndicator } from "../../components/ui/AppActivityIndicator";
14
import { SymbolView } from "../../components/ui/AppSymbol";
apps/mobile/src/features/files/FileMarkdownPreview.tsx
+2
-1
@@ -5,7 +5,8 @@ import { getBrowseDirectoryPath } from "@t3tools/client-runtime/state/projects";
5
import { maskMarkdownFrontmatter } from "@t3tools/shared/markdownFrontmatter";
6
import { useState } from "react";
7
import { StackActions, useNavigation } from "@react-navigation/native";
8
-import { RefreshControl, ScrollView, View } from "react-native";
8
+import { ScrollView, View } from "react-native";
9
+import { RefreshControl } from "../../components/ui/RefreshControl";
10
11
import { tryOpenExternalUrl } from "../../lib/openExternalUrl";
12
import { FONT_FAMILIES } from "../../lib/fontFamilies";
apps/mobile/src/features/files/FileTreeBrowser.tsx
+2
-1
@@ -5,7 +5,8 @@ import type { ProjectEntry } from "@t3tools/contracts";
5
import { AppActivityIndicator } from "../../components/ui/AppActivityIndicator";
6
import { SymbolView } from "../../components/ui/AppSymbol";
7
import { useEffect, useRef, useState } from "react";
8
-import { Pressable, RefreshControl, View } from "react-native";
8
+import { Pressable, View } from "react-native";
9
+import { RefreshControl } from "../../components/ui/RefreshControl";
10
11
import { AppText as Text } from "../../components/ui/AppText";
12
import { PierreEntryIcon } from "../../components/PierreEntryIcon";
apps/mobile/src/features/files/SourceFileSurface.tsx
+1
-1
@@ -7,13 +7,13 @@ import { useLayoutEffect, useRef, useState } from "react";
7
import {
8
Platform,
9
Pressable,
10
- RefreshControl,
10
ScrollView,
11
Text as NativeText,
12
useWindowDimensions,
13
View,
14
} from "react-native";
15
import { NativeScrollView } from "../../native/NativeScrollViewMarker";
16
+import { RefreshControl } from "../../components/ui/RefreshControl";
17
import { WebView } from "react-native-webview";
18
import { useSafeAreaInsets } from "react-native-safe-area-context";
19
import { AppText as Text } from "../../components/ui/AppText";
apps/mobile/src/features/files/thread-file-navigator-pane.tsx
+4
-5
@@ -4,7 +4,7 @@ import type { EnvironmentId } from "@t3tools/contracts";
4
import { AppBar } from "../../components/ui/AppBar";
5
import { ScreenContent } from "../../components/ui/ScreenContent";
6
import { useState } from "react";
7
-import { View } from "react-native";
7
+import { SheetPane } from "../../components/ui/SheetPane";
8
9
import { useEnvironmentQuery } from "../../state/query";
10
import { useEnvironmentPresentation } from "../../state/presentation";
@@ -78,9 +78,7 @@ export function ThreadFileNavigatorPane(props: {
78
);
79
80
return (
81
- // Material drags target the first scroll view, so place content before the header.
82
- <View className="flex-1 ios:bg-sheet android:bg-header android:flex-col-reverse">
83
- <ScreenContent insetHorizontal>{fileTree}</ScreenContent>
81
+ <SheetPane>
82
<AppBar
83
title="Files"
84
subtitle={props.projectName}
@@ -91,6 +89,7 @@ export function ThreadFileNavigatorPane(props: {
89
}}
90
refresh={{ accessibilityLabel: "Refresh files", onPress: entriesQuery.refresh }}
91
/>
94
- </View>
92
+ <ScreenContent insetHorizontal>{fileTree}</ScreenContent>
93
+ </SheetPane>
94
);
95
}
apps/mobile/src/features/layout/createWorkspaceStackNavigator.android.tsx
+6
-1
@@ -19,6 +19,7 @@ import {
19
} from "@react-navigation/native-stack";
20
import { use, type ComponentProps } from "react";
21
22
+import { BottomSheetContext } from "../../components/ui/BottomSheetContext";
23
import { RoutedFormSheetContext } from "../../components/ui/RoutedFormSheetContext";
24
25
import {
@@ -131,7 +132,11 @@ function WorkspaceStackNavigator({
132
...(descriptor.options.presentation === "formSheet"
133
? {
134
render: () => (
134
- <RoutedFormSheetContext value>{descriptor.render()}</RoutedFormSheetContext>
135
+ <BottomSheetContext value>
136
+ <RoutedFormSheetContext value>
137
+ {descriptor.render()}
138
+ </RoutedFormSheetContext>
139
+ </BottomSheetContext>
140
),
141
}
142
: undefined),
apps/mobile/src/features/layout/workspace-inspector-sheet.tsx
+4
-24
@@ -1,10 +1,8 @@
1
import { createContext, useRef, useState } from "react";
2
-import { Platform, View } from "react-native";
2
import { SafeAreaInsetsContext, useSafeAreaInsets } from "react-native-safe-area-context";
4
-import { FormSheet } from "react-native-screens";
5
-import { useResolveClassNames } from "uniwind";
3
4
import { PaneContext } from "../../components/ui/Pane";
5
+import { PaneSheet } from "../../components/ui/PaneSheet";
6
import { RoutedFormSheetContext } from "../../components/ui/RoutedFormSheetContext";
7
import { formSheetDetents } from "../../native/sheet-surface";
8
import { InspectorPanes } from "./inspector-host";
@@ -22,7 +20,6 @@ export function WorkspaceInspectorSheet(props: {
20
readonly onClose: () => void;
21
readonly content: InspectorContent | undefined;
22
}) {
25
- const containerStyle = useResolveClassNames(Platform.OS === "android" ? "bg-header" : "bg-sheet");
23
const insets = useSafeAreaInsets();
24
// Stays mounted until the sheet has finished closing, so it doesn't empty as it slides away.
25
// Each opening gets a fresh native sheet, even one that starts while the last is closing.
@@ -51,15 +48,12 @@ export function WorkspaceInspectorSheet(props: {
48
};
49
if (!presented.mounted) return null;
50
return (
54
- <FormSheet
51
+ <PaneSheet
52
key={presented.session}
53
isOpen={props.open}
54
detents={formSheetDetents(0.6, 0.95)}
58
- prefersGrabberVisible={Platform.OS === "ios"}
55
// The inspector's bar holds its actions, so the Duo needs no rail inside this sheet.
56
prefersHorizontalBars
61
- preferredCornerRadius={Platform.OS === "android" ? 28 : undefined}
62
- nativeContainerStyle={containerStyle}
57
onDismiss={closed}
58
onNativeDismiss={() => {
59
props.onClose();
@@ -71,25 +65,11 @@ export function WorkspaceInspectorSheet(props: {
65
{/* The sheet starts below the status bar. */}
66
<SafeAreaInsetsContext value={{ ...insets, top: 0 }}>
67
<PaneContext value="inspector">
74
- {/* Android FormSheet does not bound flex children. */}
75
- <View
76
- collapsable={false}
77
- className={
78
- Platform.OS === "android" ? "absolute inset-0 bg-header pt-3" : "flex-1 bg-sheet"
79
- }
80
- >
81
- <InspectorPanes content={props.content} onClose={() => close()} />
82
- {Platform.OS === "android" ? (
83
- <View
84
- pointerEvents="none"
85
- className="absolute top-1 h-1 w-8 self-center rounded-full bg-header-foreground/40"
86
- />
87
- ) : null}
88
- </View>
68
+ <InspectorPanes content={props.content} onClose={() => close()} />
69
</PaneContext>
70
</SafeAreaInsetsContext>
71
</RoutedFormSheetContext>
72
</InspectorSheetContext>
93
- </FormSheet>
73
+ </PaneSheet>
74
);
75
}
apps/mobile/src/features/pull-requests/PullRequestReviewSheet.tsx
+2
-2
@@ -6,7 +6,7 @@ import { settlePromise, squashAtomCommandFailure } from "@t3tools/client-runtime
6
import type { PullRequestReviewVerdict } from "@t3tools/contracts";
7
import { useRef, useState } from "react";
8
import { useFocusEffect } from "@react-navigation/native";
9
-import { Platform, Pressable, View } from "react-native";
9
+import { Pressable, View } from "react-native";
10
import { clearSubmittedReview } from "./pullRequestReviewDrafts";
11
import { usePullRequestReviewDraft } from "./usePullRequestReviewDraft";
12
import { reviewPositionLabel } from "./pullRequestDiffComments";
@@ -158,7 +158,7 @@ export function PullRequestReviewSheet({
158
: "Post comment"
159
}
160
fullWidth
161
- tone={Platform.OS === "android" ? "primary" : "contrast"}
161
+ tone="contrast"
162
loading={submission.busy}
163
disabled={!canSubmit || result.isPending || result.error !== null}
164
onPress={() => void perform()}
apps/mobile/src/features/pull-requests/PullRequestRouteScreen.tsx
+2
-1
@@ -61,7 +61,8 @@ import { PullRequestOverviewLoading } from "./PullRequestOverviewLoading";
61
import { copyPullRequestLink, sharePullRequestLink } from "./pullRequestLink";
62
import { pullRequestStatus } from "./pullRequestStatus";
63
import { use, useEffect, useEffectEvent, useMemo, useRef, useState } from "react";
64
-import { Linking, Platform, Pressable, RefreshControl, StyleSheet, View } from "react-native";
64
+import { Linking, Platform, Pressable, StyleSheet, View } from "react-native";
65
+import { RefreshControl } from "../../components/ui/RefreshControl";
66
import { NativeScrollView } from "../../native/NativeScrollViewMarker";
67
import { useSafeAreaInsets } from "react-native-safe-area-context";
68
apps/mobile/src/features/pull-requests/PullRequestSearchSheet.tsx
+15
-20
@@ -1,11 +1,10 @@
1
import { useNavigation } from "@react-navigation/native";
2
import type { ReactNode } from "react";
3
-import { Platform, View } from "react-native";
4
-import { useSafeAreaInsets } from "react-native-safe-area-context";
3
+import { View } from "react-native";
4
5
import { AppBar } from "../../components/ui/AppBar";
7
-import { useNativeMailSearchToolbar } from "../../native/use-native-mail-search-toolbar";
8
-import { NATIVE_MAIL_SEARCH_TOOLBAR_CONTENT_INSET } from "../layout/native-mail-search-toolbar";
6
+import type { AppBarSearch } from "../../components/ui/AppBar.types";
7
+import { useSearchToolbarInset, useUnadjustedBottomInset } from "../../components/ui/useBarInset";
8
9
/** A searchable picker over a pull request list or a pull request. */
10
export function PullRequestSearchSheet(props: {
@@ -19,9 +18,17 @@ export function PullRequestSearchSheet(props: {
18
readonly children: (list: { readonly paddingBottom: number }) => ReactNode;
19
}) {
20
const navigation = useNavigation();
21
+ const search: AppBarSearch = {
22
+ mode: "inline",
23
+ compactToolbar: true,
24
+ value: props.query,
25
+ onChangeText: props.onQueryChange,
26
+ placeholder: props.placeholder,
27
+ clearAccessibilityLabel: props.clearAccessibilityLabel,
28
+ };
29
// The compact search toolbar floats over the end of the list.
23
- const bottomSearch = useNativeMailSearchToolbar();
24
- const insets = useSafeAreaInsets();
30
+ const searchToolbarInset = useSearchToolbarInset(search);
31
+ const bottomInset = useUnadjustedBottomInset();
32
return (
33
<View className="flex-1 bg-sheet" collapsable={false}>
34
<AppBar
@@ -29,23 +36,11 @@ export function PullRequestSearchSheet(props: {
36
onClose={() => navigation.goBack()}
37
closeAccessibilityLabel={props.closeAccessibilityLabel}
38
hideBottomBorder
32
- search={{
33
- mode: "inline",
34
- compactToolbar: true,
35
- value: props.query,
36
- onChangeText: props.onQueryChange,
37
- placeholder: props.placeholder,
38
- clearAccessibilityLabel: props.clearAccessibilityLabel,
39
- }}
39
+ search={search}
40
/>
41
{props.children({
42
// Android's bottom inset also covers the floating workspace tabs while Settings is open.
43
- paddingBottom:
44
- Platform.OS === "android"
45
- ? insets.bottom + 16
46
- : bottomSearch
47
- ? NATIVE_MAIL_SEARCH_TOOLBAR_CONTENT_INSET + 16
48
- : 16,
43
+ paddingBottom: bottomInset + searchToolbarInset + 16,
44
})}
45
</View>
46
);
apps/mobile/src/features/pull-requests/PullRequestSheetContent.tsx
+19
-46
@@ -1,10 +1,8 @@
1
import { SheetHeader } from "../../components/ui/SheetHeader";
2
import { useNavigation } from "@react-navigation/native";
3
import type { ReactNode } from "react";
4
-import { Platform, ScrollView, useWindowDimensions, View } from "react-native";
5
-import { KeyboardAvoidingView } from "react-native-keyboard-controller";
6
-import { useSafeAreaInsets } from "react-native-safe-area-context";
7
-import { ScreenContent } from "../../components/ui/ScreenContent";
4
+import { View } from "react-native";
5
+import { FitSheet } from "../../components/ui/FitSheet";
6
7
export function PullRequestSheetContent(props: {
8
readonly title: string;
@@ -14,49 +12,24 @@ export function PullRequestSheetContent(props: {
12
readonly footer?: ReactNode;
13
}) {
14
const navigation = useNavigation();
17
- const insets = useSafeAreaInsets();
18
- const { height: windowHeight } = useWindowDimensions();
19
- const android = Platform.OS === "android";
20
- const footer = props.footer ? (
21
- <View
22
- className={android ? "bg-sheet-solid pt-3" : "bg-sheet px-4 pt-3"}
23
- style={{ paddingBottom: Math.max(insets.bottom, 16) }}
24
- >
25
- {android ? <View style={{ minHeight: 48 }}>{props.footer}</View> : props.footer}
26
- </View>
27
- ) : null;
15
return (
29
- // Material sheet drags follow the first nested-scrolling native view, and the inline
30
- // header's Compose button is one, so Android renders content first and reverses the column.
31
- <KeyboardAvoidingView
32
- automaticOffset
33
- behavior="padding"
34
- collapsable={false}
35
- className="bg-sheet ios:flex-1 android:flex-col-reverse"
36
- style={android ? { maxHeight: windowHeight * 0.92 } : undefined}
16
+ <FitSheet
17
+ avoidsKeyboard
18
+ header={
19
+ <SheetHeader
20
+ title={props.title}
21
+ subtitle={props.subtitle}
22
+ onCancel={() => navigation.goBack()}
23
+ dismissDisabled={props.busy}
24
+ />
25
+ }
26
+ footer={props.footer}
27
+ keyboardShouldPersistTaps="handled"
28
+ contentContainerStyle={{ paddingHorizontal: 16, paddingTop: 16, paddingBottom: 20 }}
29
>
38
- <ScreenContent fitToContents={android}>
39
- <ScrollView
40
- nestedScrollEnabled
41
- className="android:shrink android:grow-0 ios:flex-1"
42
- contentInsetAdjustmentBehavior="automatic"
43
- keyboardShouldPersistTaps="handled"
44
- contentContainerStyle={{ paddingHorizontal: 16, paddingTop: 16, paddingBottom: 20 }}
45
- >
46
- <View className="gap-4" pointerEvents={props.busy ? "none" : "auto"}>
47
- {props.children}
48
- {/* Android partial-height sheets keep submit actions within the scrollable form. */}
49
- {android ? footer : null}
50
- </View>
51
- </ScrollView>
52
- {android ? null : footer}
53
- </ScreenContent>
54
- <SheetHeader
55
- title={props.title}
56
- subtitle={props.subtitle}
57
- onCancel={() => navigation.goBack()}
58
- dismissDisabled={props.busy}
59
- />
60
- </KeyboardAvoidingView>
30
+ <View className="gap-4" pointerEvents={props.busy ? "none" : "auto"}>
31
+ {props.children}
32
+ </View>
33
+ </FitSheet>
34
);
35
}
apps/mobile/src/features/pull-requests/PullRequestsScreen.tsx
+2
-1
@@ -9,7 +9,8 @@ import { LegendList, type LegendListRef } from "@legendapp/list/react-native";
9
import { useNavigation } from "@react-navigation/native";
10
import { use, useMemo, useRef, useState, type ReactNode } from "react";
11
import { useAtomValue } from "@effect/atom-react";
12
-import { Keyboard, Platform, Pressable, RefreshControl, View } from "react-native";
12
+import { Keyboard, Platform, Pressable, View } from "react-native";
13
+import { RefreshControl } from "../../components/ui/RefreshControl";
14
import { NativeScrollView } from "../../native/NativeScrollViewMarker";
15
import { useSafeAreaInsets } from "react-native-safe-area-context";
16
apps/mobile/src/features/review/ReviewCommentComposerSheet.tsx
+117
-151
@@ -2,12 +2,11 @@ import { useNavigation, type StaticScreenProps } from "@react-navigation/native"
2
import { TextInputWrapper } from "expo-paste-input";
3
import type { EnvironmentId, ThreadId } from "@t3tools/contracts";
4
import { useMemo, useState } from "react";
5
-import { Platform, ScrollView, View, useWindowDimensions } from "react-native";
6
-import { KeyboardAvoidingView, KeyboardStickyView } from "react-native-keyboard-controller";
7
-import { useSafeAreaInsets } from "react-native-safe-area-context";
5
+import { ScrollView, View, useWindowDimensions } from "react-native";
6
import { FilePreviewModal, type FilePreviewSource } from "../../components/ui/FilePreviewModal";
7
8
import { AppText as Text, AppTextInput as TextInput } from "../../components/ui/AppText";
9
+import { KeyboardSheetBody } from "../../components/ui/KeyboardSheetBody";
10
import { SheetHeader } from "../../components/ui/SheetHeader";
11
import { ComposerAttachmentStrip } from "../../components/ComposerAttachmentStrip";
12
import { ControlPill } from "../../components/ui/ControlPill";
@@ -39,9 +38,7 @@ type ReviewCommentComposerSheetProps = StaticScreenProps<{
38
}>;
39
40
export function ReviewCommentComposerSheet(props: ReviewCommentComposerSheetProps) {
42
- const isAndroid = Platform.OS === "android";
41
const navigation = useNavigation();
44
- const insets = useSafeAreaInsets();
42
const { width } = useWindowDimensions();
43
const { themeAppearance: selectedTheme } = useAppearancePreferences();
44
const target = useReviewCommentTarget();
@@ -130,167 +127,136 @@ export function ReviewCommentComposerSheet(props: ReviewCommentComposerSheetProp
127
return (
128
<View className="flex-1 bg-sheet">
129
<SheetHeader title="Add Comment" onClose={dismissComposer} />
133
- <KeyboardAvoidingView automaticOffset behavior="padding" className="flex-1">
134
- <View
135
- className="flex-1 px-5"
136
- style={{
137
- paddingTop: 8,
138
- paddingBottom: target ? (isAndroid ? 72 : 0) : Math.max(insets.bottom, 18),
139
- }}
140
- >
141
- {!target ? (
142
- <View className="rounded-[22px] border border-border bg-card px-4 py-5">
143
- <Text className="text-base font-t3-bold text-foreground">No selection</Text>
144
- <Text className="mt-1 text-sm leading-normal text-foreground-muted">
145
- Select a diff line or range first.
130
+ <KeyboardSheetBody
131
+ toolbar={
132
+ target ? (
133
+ <>
134
+ <ControlPill
135
+ accessibilityLabel="Add image"
136
+ icon="plus"
137
+ onPress={() => void handlePickImages()}
138
+ />
139
+ <View className="flex-1" />
140
+ <ControlPill
141
+ accessibilityLabel="Comment"
142
+ icon="arrow.up"
143
+ label="Comment"
144
+ variant="primary"
145
+ disabled={!canSubmit}
146
+ onPress={handleSubmit}
147
+ />
148
+ </>
149
+ ) : undefined
150
+ }
151
+ >
152
+ {!target ? (
153
+ <View className="rounded-[22px] border border-border bg-card px-4 py-5">
154
+ <Text className="text-base font-t3-bold text-foreground">No selection</Text>
155
+ <Text className="mt-1 text-sm leading-normal text-foreground-muted">
156
+ Select a diff line or range first.
157
+ </Text>
158
+ </View>
159
+ ) : (
160
+ <View className="min-h-0 flex-1 gap-4">
161
+ <View className="gap-1 px-1">
162
+ <Text className="text-2xs font-t3-bold uppercase text-foreground-muted">
163
+ {selectionLabel}
164
+ </Text>
165
+ <Text
166
+ className="font-mono text-xs leading-snug text-foreground-muted"
167
+ ellipsizeMode="middle"
168
+ numberOfLines={2}
169
+ >
170
+ {target.filePath}
171
</Text>
172
</View>
148
- ) : (
149
- <View className="min-h-0 flex-1 gap-4">
150
- <View className="gap-1 px-1">
151
- <Text className="text-2xs font-t3-bold uppercase text-foreground-muted">
152
- {selectionLabel}
153
- </Text>
154
- <Text
155
- className="font-mono text-xs leading-snug text-foreground-muted"
156
- ellipsizeMode="middle"
157
- numberOfLines={2}
158
- >
159
- {target.filePath}
160
- </Text>
161
- </View>
173
163
- <View className="overflow-hidden rounded-[22px] border border-border bg-card">
174
+ <View className="overflow-hidden rounded-[22px] border border-border bg-card">
175
+ <ScrollView
176
+ horizontal
177
+ bounces={false}
178
+ keyboardShouldPersistTaps="always"
179
+ showsHorizontalScrollIndicator={false}
180
+ >
181
<ScrollView
165
- horizontal
182
bounces={false}
183
+ scrollEnabled={selectedLines.length > REVIEW_COMMENT_PREVIEW_MAX_LINES}
184
+ nestedScrollEnabled
185
keyboardShouldPersistTaps="always"
168
- showsHorizontalScrollIndicator={false}
186
+ showsVerticalScrollIndicator={
187
+ selectedLines.length > REVIEW_COMMENT_PREVIEW_MAX_LINES
188
+ }
189
+ style={{ height: previewHeight }}
190
>
170
- <ScrollView
171
- bounces={false}
172
- scrollEnabled={selectedLines.length > REVIEW_COMMENT_PREVIEW_MAX_LINES}
173
- nestedScrollEnabled
174
- keyboardShouldPersistTaps="always"
175
- showsVerticalScrollIndicator={
176
- selectedLines.length > REVIEW_COMMENT_PREVIEW_MAX_LINES
177
- }
178
- style={{ height: previewHeight }}
179
- >
180
- <View style={{ minWidth: previewViewportWidth }}>
181
- {selectedLines.map((line) => {
182
- const lineNumber = getReviewUnifiedLineNumber(line);
191
+ <View style={{ minWidth: previewViewportWidth }}>
192
+ {selectedLines.map((line) => {
193
+ const lineNumber = getReviewUnifiedLineNumber(line);
194
184
- return (
185
- <View
186
- key={line.id}
187
- className={cn("flex-row items-start", changeTone(line.change))}
188
- style={{ height: codeSurface.rowHeight }}
189
- >
190
- <ReviewChangeBar change={line.change} height={codeSurface.rowHeight} />
191
- <Text className="w-9 py-1 pr-1 text-right text-2xs font-mono text-foreground-muted">
192
- {lineNumber ?? ""}
193
- </Text>
194
- <View className="min-w-0 flex-1 shrink-0 px-1 py-1">
195
- <DiffTokenText
196
- fallback={line.content}
197
- tokens={highlightedLinesById[line.id] ?? null}
198
- change={line.change}
199
- fontSize={codeSurface.fontSize}
200
- lineHeight={codeSurface.rowHeight}
201
- />
202
- </View>
195
+ return (
196
+ <View
197
+ key={line.id}
198
+ className={cn("flex-row items-start", changeTone(line.change))}
199
+ style={{ height: codeSurface.rowHeight }}
200
+ >
201
+ <ReviewChangeBar change={line.change} height={codeSurface.rowHeight} />
202
+ <Text className="w-9 py-1 pr-1 text-right text-2xs font-mono text-foreground-muted">
203
+ {lineNumber ?? ""}
204
+ </Text>
205
+ <View className="min-w-0 flex-1 shrink-0 px-1 py-1">
206
+ <DiffTokenText
207
+ fallback={line.content}
208
+ tokens={highlightedLinesById[line.id] ?? null}
209
+ change={line.change}
210
+ fontSize={codeSurface.fontSize}
211
+ lineHeight={codeSurface.rowHeight}
212
+ />
213
</View>
204
- );
205
- })}
206
- </View>
207
- </ScrollView>
214
+ </View>
215
+ );
216
+ })}
217
+ </View>
218
</ScrollView>
209
- </View>
219
+ </ScrollView>
220
+ </View>
221
211
- <View className="min-h-0 flex-1 gap-2">
212
- <Text className="text-sm font-t3-bold text-foreground">Comment</Text>
213
- <View className="min-h-[132px] flex-1 overflow-hidden rounded-[20px] border border-border bg-card">
214
- <View className="min-h-0 flex-1 px-4 pt-3.5">
215
- <TextInputWrapper onPaste={handleNativePaste} style={{ flex: 1, minHeight: 0 }}>
216
- <TextInput
217
- autoFocus
218
- multiline
219
- scrollEnabled
220
- placeholder="Leave a comment..."
221
- textAlignVertical="top"
222
- value={commentText}
223
- onChangeText={setCommentText}
224
- className="h-full min-h-0 flex-1 border-0 bg-transparent px-0 py-0 font-sans text-base"
225
- />
226
- </TextInputWrapper>
227
- </View>
228
- {attachments.length > 0 ? (
229
- <View className="px-4 pb-3 pt-2">
230
- <ComposerAttachmentStrip
231
- attachments={attachments}
232
- imageBorderRadius={16}
233
- imageSize={60}
234
- onPressPreview={setPreviewFile}
235
- removeButtonPlacement="gutter"
236
- onRemove={(imageId) => {
237
- setAttachments((current) =>
238
- current.filter((image) => image.id !== imageId),
239
- );
240
- }}
241
- />
242
- </View>
243
- ) : null}
222
+ <View className="min-h-0 flex-1 gap-2">
223
+ <Text className="text-sm font-t3-bold text-foreground">Comment</Text>
224
+ <View className="min-h-[132px] flex-1 overflow-hidden rounded-[20px] border border-border bg-card">
225
+ <View className="min-h-0 flex-1 px-4 pt-3.5">
226
+ <TextInputWrapper onPaste={handleNativePaste} style={{ flex: 1, minHeight: 0 }}>
227
+ <TextInput
228
+ autoFocus
229
+ multiline
230
+ scrollEnabled
231
+ placeholder="Leave a comment..."
232
+ textAlignVertical="top"
233
+ value={commentText}
234
+ onChangeText={setCommentText}
235
+ className="h-full min-h-0 flex-1 border-0 bg-transparent px-0 py-0 font-sans text-base"
236
+ />
237
+ </TextInputWrapper>
238
</View>
239
+ {attachments.length > 0 ? (
240
+ <View className="px-4 pb-3 pt-2">
241
+ <ComposerAttachmentStrip
242
+ attachments={attachments}
243
+ imageBorderRadius={16}
244
+ imageSize={60}
245
+ onPressPreview={setPreviewFile}
246
+ removeButtonPlacement="gutter"
247
+ onRemove={(imageId) => {
248
+ setAttachments((current) =>
249
+ current.filter((image) => image.id !== imageId),
250
+ );
251
+ }}
252
+ />
253
+ </View>
254
+ ) : null}
255
</View>
256
</View>
247
- )}
248
- </View>
249
- {!isAndroid && target ? (
250
- <View className="flex-row items-center gap-3 bg-sheet px-5 py-2">
251
- <ControlPill
252
- accessibilityLabel="Add image"
253
- icon="plus"
254
- onPress={() => void handlePickImages()}
255
- />
256
- <View className="flex-1" />
257
- <ControlPill
258
- accessibilityLabel="Comment"
259
- icon="arrow.up"
260
- label="Comment"
261
- variant="primary"
262
- disabled={!canSubmit}
263
- onPress={handleSubmit}
264
- />
265
- </View>
266
- ) : null}
267
- </KeyboardAvoidingView>
268
- {isAndroid && target ? (
269
- <KeyboardStickyView
270
- className="absolute inset-x-0 bottom-0"
271
- offset={{ closed: 0, opened: 0 }}
272
- >
273
- <View
274
- className="flex-row items-center gap-3 border-t border-border bg-sheet px-5 pt-2"
275
- style={{ paddingBottom: Math.max(insets.bottom, 10) }}
276
- >
277
- <ControlPill
278
- accessibilityLabel="Add image"
279
- icon="plus"
280
- onPress={() => void handlePickImages()}
281
- />
282
- <View className="flex-1" />
283
- <ControlPill
284
- accessibilityLabel="Comment"
285
- icon="arrow.up"
286
- label="Comment"
287
- variant="primary"
288
- disabled={!canSubmit}
289
- onPress={handleSubmit}
290
- />
257
</View>
292
- </KeyboardStickyView>
293
- ) : null}
258
+ )}
259
+ </KeyboardSheetBody>
260
<FilePreviewModal source={previewFile} onRequestClose={() => setPreviewFile(null)} />
261
</View>
262
);
apps/mobile/src/features/review/ReviewSheet.tsx
+35
-110
@@ -4,31 +4,28 @@ import type { EnvironmentId, ThreadId } from "@t3tools/contracts";
4
import { formatDiffCount } from "@t3tools/client-runtime/diff-count";
5
import { LegendList } from "@legendapp/list/react-native";
6
import { useNavigation, type StaticScreenProps } from "@react-navigation/native";
7
-import { AppActivityIndicator } from "../../components/ui/AppActivityIndicator";
7
import { AppBar } from "../../components/ui/AppBar";
8
import type { AppBarMenuItem } from "../../components/ui/AppBar.types";
9
import type { ReviewSectionItem } from "./reviewModel";
10
import { useReviewHeaderPresentation } from "./useReviewHeaderPresentation";
11
import { type Ref, type ReactElement, useImperativeHandle, useRef, useState } from "react";
13
-import {
14
- Platform,
15
- Pressable,
16
- RefreshControl,
17
- ScrollView,
18
- type NativeSyntheticEvent,
19
- StyleSheet,
20
- View,
21
-} from "react-native";
12
+import { Pressable, ScrollView, type NativeSyntheticEvent, StyleSheet, View } from "react-native";
13
+import { RefreshControl } from "../../components/ui/RefreshControl";
14
import { useSafeAreaInsets } from "react-native-safe-area-context";
15
import { useReduceMotionEnabled } from "../../lib/appState";
24
-import { useNativeColumnLayoutMetrics } from "../../native/native-layout-metrics";
25
-import { useContentTopInset } from "../../components/ui/useBarInset";
16
+import { useContentTopInset, useSheetContentBottomInset } from "../../components/ui/useBarInset";
17
import { NativeScrollView } from "../../native/NativeScrollViewMarker";
18
19
import { AppText as Text } from "../../components/ui/AppText";
20
import { SymbolView } from "../../components/ui/AppSymbol";
21
+import {
22
+ ContentBand,
23
+ ContentStatus,
24
+ contentStatusContainerStyle,
25
+} from "../../components/ui/ContentBand";
26
+import { PaneListItem } from "../../components/ui/PaneListItem";
27
import { ScreenContent } from "../../components/ui/ScreenContent";
31
-import { cn } from "../../lib/cn";
28
+import { SheetPane } from "../../components/ui/SheetPane";
29
import { environmentCatalog } from "../../connection/catalog";
30
import { useEnvironmentPresentation } from "../../state/presentation";
31
import { useAtomCommand } from "../../state/use-atom-command";
@@ -149,15 +146,10 @@ const SHOWCASE_ENABLED = process.env.EXPO_PUBLIC_SHOWCASE === "1";
146
147
const ReviewNotice = function ReviewNotice(props: { readonly notice: string }) {
148
return (
152
- <View
153
- className={cn(
154
- "bg-warning px-4 py-3",
155
- Platform.OS === "android" ? "m-2 rounded-[20px]" : "border-b border-warning-border",
156
- )}
157
- >
149
+ <ContentBand tone="warning">
150
<Text className="text-xs font-t3-bold uppercase text-warning-foreground">Partial diff</Text>
151
<Text className="text-xs leading-normal text-warning-foreground">{props.notice}</Text>
160
- </View>
152
+ </ContentBand>
153
);
154
};
155
@@ -242,21 +234,7 @@ const ReviewFileNavigatorRow = function ReviewFileNavigatorRow(props: {
234
};
235
236
return (
245
- <Pressable
246
- accessibilityRole="button"
247
- accessibilityState={{ selected }}
248
- className={
249
- Platform.OS === "android"
250
- ? cn(
251
- "mt-1 min-h-12 justify-center rounded-[20px] px-3 py-2 active:bg-subtle",
252
- selected && "bg-subtle-strong",
253
- )
254
- : selected
255
- ? "mt-1 min-h-12 justify-center rounded-xl bg-subtle-strong px-3 py-2"
256
- : "mt-1 min-h-12 justify-center rounded-xl px-3 py-2 active:bg-subtle"
257
- }
258
- onPress={handlePress}
259
- >
237
+ <PaneListItem selected={selected} onPress={handlePress}>
238
<Text
239
className={
240
selected
@@ -275,7 +253,7 @@ const ReviewFileNavigatorRow = function ReviewFileNavigatorRow(props: {
253
-{formatDiffCount(file.deletions)}
254
</Text>
255
</View>
278
- </Pressable>
256
+ </PaneListItem>
257
);
258
};
259
@@ -334,7 +312,7 @@ function ReviewFileNavigator({ files, sectionId, onSelectFile, ref }: ReviewFile
312
);
313
314
return (
337
- <View className="flex-1 ios:bg-sheet android:bg-header">
315
+ <SheetPane>
316
<AppBar
317
title="Changed files"
318
subtitle={`${files.length} ${files.length === 1 ? "file" : "files"}`}
@@ -354,7 +332,7 @@ function ReviewFileNavigator({ files, sectionId, onSelectFile, ref }: ReviewFile
332
renderItem={renderFile}
333
/>
334
</ScreenContent>
357
- </View>
335
+ </SheetPane>
336
);
337
}
338
@@ -378,11 +356,8 @@ export function ReviewSheet(props: ReviewSheetProps) {
356
const { draftMessage, draftContext } = useThreadDraftForThread({ environmentId, threadId });
357
const reviewCache = useReviewCacheForThread({ environmentId, threadId });
358
const { selectedThreadCwd } = useSelectedThreadWorktree();
381
- const columnMetrics = useNativeColumnLayoutMetrics();
382
- const safeArea = columnMetrics?.safeArea ?? insets;
359
const topContentInset = useContentTopInset();
384
- const bottomContentInset =
385
- Platform.OS === "ios" ? safeArea.bottom + 8 : Math.max(insets.bottom, 18) + 18;
360
+ const bottomContentInset = useSheetContentBottomInset();
361
362
const {
363
error,
@@ -577,16 +552,10 @@ export function ReviewSheet(props: ReviewSheetProps) {
552
553
if (error) {
554
children.push(
580
- <View
581
- key="review-error"
582
- className={cn(
583
- "bg-card px-4 py-3",
584
- Platform.OS === "android" ? "m-2 rounded-[20px]" : "border-b border-border",
585
- )}
586
- >
555
+ <ContentBand key="review-error">
556
<Text className="text-sm font-t3-bold text-foreground">Review unavailable</Text>
557
<Text className="text-xs leading-normal text-foreground-muted">{error}</Text>
589
- </View>,
558
+ </ContentBand>,
559
);
560
}
561
@@ -636,7 +605,7 @@ export function ReviewSheet(props: ReviewSheetProps) {
605
/>
606
607
<ScreenContent>
639
- <View className="flex-1 bg-sheet android:bg-sheet-solid">
608
+ <View className="flex-1 bg-sheet">
609
{showConnectionNotice ? (
610
<View className="flex-1" style={{ paddingTop: topContentInset }}>
611
<EnvironmentConnectionNotice
@@ -704,8 +673,8 @@ export function ReviewSheet(props: ReviewSheetProps) {
673
<ScrollView
674
key={fallbackScrollViewKey}
675
contentContainerStyle={
707
- Platform.OS === "android" && (parsedDiff.kind === "empty" || !selectedSection)
708
- ? { flexGrow: 1, justifyContent: "center" }
676
+ parsedDiff.kind === "empty" || !selectedSection
677
+ ? contentStatusContainerStyle
678
: undefined
679
}
680
contentInsetAdjustmentBehavior="never"
@@ -726,59 +695,20 @@ export function ReviewSheet(props: ReviewSheetProps) {
695
{listHeader}
696
{!selectedSection ? (
697
error ? null : (
729
- <View
730
- className={
731
- Platform.OS === "android"
732
- ? "items-center px-6 py-5"
733
- : "border-b border-border bg-card px-4 py-5"
734
- }
735
- >
736
- <Text className="text-sm font-t3-bold text-foreground">No review diffs</Text>
737
- <Text
738
- className={cn(
739
- "text-xs leading-normal text-foreground-muted",
740
- Platform.OS === "android" && "mt-2 text-center",
741
- )}
742
- >
743
- This thread has no ready turn diffs and the worktree diff is empty.
744
- </Text>
745
- </View>
698
+ <ContentStatus
699
+ title="No review diffs"
700
+ detail="This thread has no ready turn diffs and the worktree diff is empty."
701
+ />
702
)
703
) : selectedSection.isLoading && selectedSection.diff === null ? (
748
- <View
749
- className={cn(
750
- "items-center gap-3 px-4 py-6",
751
- Platform.OS !== "android" && "border-b border-border bg-card",
752
- )}
753
- >
754
- <AppActivityIndicator size="small" />
755
- <Text className="text-xs text-foreground-muted">Loading diff…</Text>
756
- </View>
704
+ <ContentStatus loading detail="Loading diff…" />
705
) : parsedDiff.kind === "empty" ? (
758
- <View
759
- className={
760
- Platform.OS === "android"
761
- ? "items-center px-6 py-5"
762
- : "border-b border-border bg-card px-4 py-5"
763
- }
764
- >
765
- <Text className="text-sm font-t3-bold text-foreground">No changes</Text>
766
- <Text
767
- className={cn(
768
- "text-xs leading-normal text-foreground-muted",
769
- Platform.OS === "android" && "mt-2 text-center",
770
- )}
771
- >
772
- {selectedSection.subtitle ?? "This diff is empty."}
773
- </Text>
774
- </View>
706
+ <ContentStatus
707
+ title="No changes"
708
+ detail={selectedSection.subtitle ?? "This diff is empty."}
709
+ />
710
) : parsedDiff.kind === "raw" ? (
776
- <View
777
- className={cn(
778
- "gap-3 bg-card px-4 py-4",
779
- Platform.OS === "android" ? "m-2 rounded-[20px]" : "border-b border-border",
780
- )}
781
- >
711
+ <ContentBand spacing="roomy">
712
<Text className="text-xs leading-normal text-foreground-muted">
713
{parsedDiff.reason}
714
</Text>
@@ -787,14 +717,9 @@ export function ReviewSheet(props: ReviewSheetProps) {
717
{parsedDiff.text}
718
</Text>
719
</ScrollView>
790
- </View>
720
+ </ContentBand>
721
) : parsedDiff.kind === "files" ? (
792
- <View
793
- className={cn(
794
- "gap-3 bg-card px-4 py-4",
795
- Platform.OS === "android" ? "m-2 rounded-[20px]" : "border-b border-border",
796
- )}
797
- >
722
+ <ContentBand spacing="roomy">
723
<Text className="text-xs leading-normal text-foreground-muted">
724
Native diff view unavailable. Showing the raw patch.
725
</Text>
@@ -803,7 +728,7 @@ export function ReviewSheet(props: ReviewSheetProps) {
728
{selectedSection?.diff ?? ""}
729
</Text>
730
</ScrollView>
806
- </View>
731
+ </ContentBand>
732
) : null}
733
</ScrollView>
734
)}
apps/mobile/src/features/settings/SettingsEnvironmentsRouteScreen.tsx
+1
-1
@@ -4,7 +4,7 @@ import { useAtomValue } from "@effect/atom-react";
4
import { managedRelaySessionAtom } from "@t3tools/client-runtime/relay";
5
import type { EnvironmentId } from "@t3tools/contracts";
6
import { useRef, useState } from "react";
7
-import { RefreshControl } from "react-native";
7
+import { RefreshControl } from "../../components/ui/RefreshControl";
8
import { useSafeAreaInsets } from "react-native-safe-area-context";
9
10
import { SettingsScreen } from "./components/SettingsScreen";
apps/mobile/src/features/threads/ThreadPullRequestsSheet.tsx
+3
-3
@@ -1,7 +1,7 @@
1
import { useNavigation, type StaticScreenProps } from "@react-navigation/native";
2
import { LegendList } from "@legendapp/list/react-native";
3
import { useMemo } from "react";
4
-import { Platform, View } from "react-native";
4
+import { View } from "react-native";
5
import { useSafeAreaInsets } from "react-native-safe-area-context";
6
7
import { AppText as Text } from "../../components/ui/AppText";
@@ -44,7 +44,7 @@ export function ThreadPullRequestsSheet(
44
const title = `Linked ${actions.terminology.plural}`;
45
46
const content = (
47
- <View className="flex-1 android:bg-sheet-solid ios:bg-screen">
47
+ <View className="flex-1 bg-screen">
48
{/* oxlint-disable-next-line t3code/require-registered-list-scroll -- Sheet content; sheets sit outside workspace columns and keep their own header handling. */}
49
<LegendList
50
data={lines}
@@ -54,7 +54,7 @@ export function ThreadPullRequestsSheet(
54
<LinkedPullRequestRow
55
line={item}
56
separator={index < lines.length - 1}
57
- surfaceClassName={Platform.OS === "ios" ? "text-screen" : "text-sheet-solid"}
57
+ surfaceClassName="text-screen"
58
openPullRequest={openPullRequest}
59
actions={actions}
60
/>
apps/mobile/src/features/threads/ThreadSettingsSheet.tsx
+10
-14
@@ -45,7 +45,9 @@ import {
45
useState,
46
type ReactNode,
47
} from "react";
48
-import { Platform, Pressable, RefreshControl, ScrollView, View } from "react-native";
48
+import { Pressable, ScrollView, View } from "react-native";
49
+import { READABLE_WIDTH_STYLE, ROW_MIN_HEIGHT } from "../../components/ui/listMetrics";
50
+import { RefreshControl } from "../../components/ui/RefreshControl";
51
import Animated, {
52
FadeIn,
53
FadeOut,
@@ -182,7 +184,8 @@ function ProviderHeader(props: {
184
accessibilityLabel={`${props.label}, ${props.modelCount} models`}
185
accessibilityRole="button"
186
accessibilityState={{ expanded: !props.collapsed }}
185
- className="mx-4 mt-1 min-h-11 flex-row items-center gap-2 rounded-xl px-1 pt-2 active:opacity-60 android:min-h-12"
187
+ className="mx-4 mt-1 flex-row items-center gap-2 rounded-xl px-1 pt-2 active:opacity-60"
188
+ style={{ minHeight: ROW_MIN_HEIGHT.control }}
189
onPress={props.onToggle}
190
>
191
{content}
@@ -208,9 +211,10 @@ function DisclosureRow(props: {
211
accessibilityRole="button"
212
onPress={props.onPress}
213
className={cn(
211
- "min-h-11 flex-row items-center gap-2 bg-grouped-card px-4 py-2 active:bg-subtle android:min-h-14",
214
+ "flex-row items-center gap-2 bg-grouped-card px-4 py-2 active:bg-subtle",
215
!props.isLast && "border-b border-border-subtle",
216
)}
217
+ style={{ minHeight: ROW_MIN_HEIGHT.item }}
218
>
219
<Text className="text-sm font-t3-medium text-foreground">{props.label}</Text>
220
<View className="flex-1" />
@@ -1048,15 +1052,11 @@ function ThreadSettingsMainContent(props: {
1052
alwaysBounceVertical
1053
automaticallyAdjustsScrollIndicatorInsets
1054
className="flex-1 bg-sheet"
1051
- style={
1052
- Platform.OS === "android"
1053
- ? { width: "100%", maxWidth: 720, alignSelf: "center" }
1054
- : undefined
1055
- }
1055
+ style={READABLE_WIDTH_STYLE}
1056
contentContainerStyle={{ paddingTop: 4 }}
1057
contentInsetAdjustmentBehavior="automatic"
1058
data={listItems}
1059
- estimatedItemSize={Platform.OS === "android" ? 56 : 48}
1059
+ estimatedItemSize={ROW_MIN_HEIGHT.item}
1060
extraData={animationsReady}
1061
getItemType={(item) => item.kind}
1062
itemLayoutAnimation={THREAD_SETTINGS_CATALOG_LAYOUT_TRANSITION}
@@ -1151,11 +1151,7 @@ function ThreadSettingsChoiceContent(props: {
1151
return (
1152
<ScrollView
1153
className="flex-1 bg-sheet"
1154
- style={
1155
- Platform.OS === "android"
1156
- ? { width: "100%", maxWidth: 720, alignSelf: "center" }
1157
- : undefined
1158
- }
1154
+ style={READABLE_WIDTH_STYLE}
1155
contentContainerStyle={{
1156
paddingBottom: insets.bottom + 12,
1157
paddingHorizontal: 16,
apps/mobile/src/features/threads/git/GitBranchesSheet.occupancy.test.tsx
+16
-15
@@ -8,25 +8,26 @@ const checkout = vi.hoisted(() => ({
8
branches: [] as Array<{ name: string; worktreePath: string | null }>,
9
}));
10
11
-vi.mock("react-native", () => ({
12
- Platform: { OS: "android" },
13
- View: ({ children }: { children: ReactNode }) => <div>{children}</div>,
14
- ScrollView: ({ children }: { children: ReactNode }) => <div>{children}</div>,
15
- Pressable: ({ children, disabled }: { children: ReactNode; disabled: boolean }) => (
16
- <button disabled={disabled}>{children}</button>
17
- ),
18
- useWindowDimensions: () => ({ height: 800 }),
19
-}));
11
vi.mock("@react-navigation/native", () => ({ useNavigation: () => ({}) }));
21
-vi.mock("react-native-safe-area-context", () => ({ useSafeAreaInsets: () => ({ bottom: 0 }) }));
12
vi.mock("../../../components/ui/SheetHeader", () => ({ SheetHeader: () => null }));
23
-vi.mock("../../../components/ui/ScreenContent", () => ({
24
- ScreenContent: ({ children }: { children: ReactNode }) => <div>{children}</div>,
13
+vi.mock("../../../components/ui/FitSheet", () => ({
14
+ FitSheet: ({ children }: { children: ReactNode }) => <div>{children}</div>,
15
}));
16
vi.mock("../../../native/StackHeader", () => ({ NativeStackScreenOptions: () => null }));
27
-vi.mock("../../../components/ui/AppText", () => ({
28
- AppText: ({ children }: { children: ReactNode }) => <span>{children}</span>,
29
- AppTextInput: () => null,
17
+vi.mock("../../../components/ui/FormSection", () => ({
18
+ FormSection: () => null,
19
+ FormField: () => null,
20
+}));
21
+vi.mock("../../../components/ui/ListSection", () => ({
22
+ ListSection: ({ children }: { children: ReactNode }) => <div>{children}</div>,
23
+}));
24
+vi.mock("../../../components/ui/ListChoiceRow", () => ({
25
+ ListChoiceRow: (props: { label: string; description: string; disabled: boolean }) => (
26
+ <button disabled={props.disabled}>
27
+ <span>{props.label}</span>
28
+ <span>{props.description}</span>
29
+ </button>
30
+ ),
31
}));
32
vi.mock("./gitSheetComponents", () => ({ SheetActionButton: () => null }));
33
vi.mock("../../../state/entities", () => ({}));
apps/mobile/src/features/threads/git/GitBranchesSheet.test.tsx
+7
-15
@@ -17,28 +17,20 @@ const state = vi.hoisted(() => ({
17
}));
18
19
vi.mock("@react-navigation/native", () => ({ useNavigation: () => ({ goBack() {} }) }));
20
-vi.mock("react-native", () => ({
21
- Platform: { OS: "android" },
22
- useWindowDimensions: () => ({ height: 800 }),
23
- View: ({ children }: { children: ReactNode }) => children,
24
- ScrollView: ({ children }: { children: ReactNode }) => children,
25
- Pressable: () => null,
26
-}));
27
-vi.mock("react-native-safe-area-context", () => ({
28
- useSafeAreaInsets: () => ({ bottom: 0 }),
29
-}));
20
vi.mock("../../../components/ui/SheetHeader", () => ({ SheetHeader: () => null }));
31
-vi.mock("../../../components/ui/ScreenContent", () => ({
32
- ScreenContent: ({ children }: { children: ReactNode }) => children,
21
+vi.mock("../../../components/ui/FitSheet", () => ({
22
+ FitSheet: ({ children }: { children: ReactNode }) => children,
23
}));
24
vi.mock("../../../native/StackHeader", () => ({ NativeStackScreenOptions: () => null }));
35
-vi.mock("../../../components/ui/AppText", () => ({
36
- AppText: ({ children }: { children: ReactNode }) => children,
37
- AppTextInput: (props: InputProps) => {
25
+vi.mock("../../../components/ui/FormSection", () => ({
26
+ FormSection: ({ children }: { children: ReactNode }) => children,
27
+ FormField: (props: InputProps) => {
28
state.inputs.set(props.accessibilityLabel, props);
29
return null;
30
},
31
}));
32
+vi.mock("../../../components/ui/ListSection", () => ({ ListSection: () => null }));
33
+vi.mock("../../../components/ui/ListChoiceRow", () => ({ ListChoiceRow: () => null }));
34
vi.mock("../../../state/query", () => ({
35
useEnvironmentQuery: () => ({
36
data: state.refName === null ? undefined : { refName: state.refName },
apps/mobile/src/features/threads/git/GitBranchesSheet.tsx
+104
-154
@@ -1,13 +1,12 @@
1
import { sanitizeFeatureBranchName } from "@t3tools/shared/git";
2
import { useNavigation, type StaticScreenProps } from "@react-navigation/native";
3
import { useState } from "react";
4
-import { Platform, Pressable, ScrollView, useWindowDimensions, View } from "react-native";
5
-import { useSafeAreaInsets } from "react-native-safe-area-context";
4
5
import { SheetHeader } from "../../../components/ui/SheetHeader";
8
-import { ScreenContent } from "../../../components/ui/ScreenContent";
9
-import { AppText as Text, AppTextInput as TextInput } from "../../../components/ui/AppText";
10
-import { cn } from "../../../lib/cn";
6
+import { FitSheet } from "../../../components/ui/FitSheet";
7
+import { FormField, FormSection } from "../../../components/ui/FormSection";
8
+import { ListChoiceRow } from "../../../components/ui/ListChoiceRow";
9
+import { ListSection } from "../../../components/ui/ListSection";
10
import { useEnvironmentQuery } from "../../../state/query";
11
import { useThreadSelection } from "../../../state/use-thread-selection";
12
import { useSelectedThreadGitActions } from "../../../state/use-selected-thread-git-actions";
@@ -23,8 +22,6 @@ type GitBranchesSheetProps = StaticScreenProps<{
22
23
export function GitBranchesSheet(_props: GitBranchesSheetProps) {
24
const navigation = useNavigation();
26
- const insets = useSafeAreaInsets();
27
- const { height: windowHeight } = useWindowDimensions();
25
const { selectedThread } = useThreadSelection();
26
const { selectedThreadCwd } = useSelectedThreadWorktree();
27
const gitState = useSelectedThreadGitState();
@@ -62,160 +59,113 @@ export function GitBranchesSheet(_props: GitBranchesSheetProps) {
59
const disabledExistingBranches = new Set(disabledExistingBranchNames);
60
61
return (
65
- <View
66
- collapsable={false}
67
- className="bg-sheet ios:flex-1 android:flex-col-reverse"
68
- style={Platform.OS === "android" ? { maxHeight: windowHeight * 0.92 } : undefined}
62
+ <FitSheet
63
+ header={<SheetHeader title="Branches & worktrees" onClose={() => navigation.goBack()} />}
64
+ keyboardShouldPersistTaps="handled"
65
+ showsVerticalScrollIndicator={false}
66
>
70
- <ScreenContent fitToContents>
71
- <ScrollView
72
- nestedScrollEnabled
73
- className="android:shrink android:grow-0 ios:flex-1"
74
- contentInsetAdjustmentBehavior="automatic"
75
- keyboardShouldPersistTaps="handled"
76
- showsVerticalScrollIndicator={false}
77
- contentInset={{ bottom: Math.max(insets.bottom, 18) + 18 }}
78
- contentContainerClassName="android:gap-2 android:p-2 ios:gap-4 ios:px-5 ios:pt-2"
79
- contentContainerStyle={
80
- Platform.OS === "android"
81
- ? { paddingBottom: Math.max(insets.bottom, 18) + 18 }
82
- : undefined
67
+ <FormSection title="New branch">
68
+ <FormField
69
+ value={newBranchName}
70
+ onChangeText={setNewBranchName}
71
+ placeholder="feature/mobile-polish"
72
+ accessibilityLabel="New branch name"
73
+ />
74
+ <SheetActionButton
75
+ icon="plus"
76
+ label="Create & checkout"
77
+ tone="primary"
78
+ disabled={!canChangeThreadBranch || busy || newBranchName.trim().length === 0}
79
+ onPress={() => {
80
+ const branch = sanitizeFeatureBranchName(newBranchName.trim());
81
+ if (branch.length === 0) return;
82
+ void gitActions.onCreateSelectedThreadBranch(branch).then((result) => {
83
+ if (result === null) return;
84
+ setNewBranchName("");
85
+ navigation.goBack();
86
+ });
87
+ }}
88
+ />
89
+ </FormSection>
90
+
91
+ <FormSection title="New worktree">
92
+ <FormField
93
+ label="Base branch"
94
+ value={worktreeBaseBranch}
95
+ onChangeText={setWorktreeBaseBranchOverride}
96
+ placeholder="main"
97
+ accessibilityLabel="Worktree base branch"
98
+ />
99
+ <FormField
100
+ label="New branch"
101
+ value={worktreeBranchName}
102
+ onChangeText={setWorktreeBranchName}
103
+ placeholder="feature/mobile-thread"
104
+ accessibilityLabel="Worktree branch name"
105
+ />
106
+ <SheetActionButton
107
+ icon="square.split.2x1"
108
+ label="Create worktree"
109
+ tone="primary"
110
+ disabled={
111
+ !canChangeThreadBranch ||
112
+ busy ||
113
+ worktreeBaseBranch.trim().length === 0 ||
114
+ worktreeBranchName.trim().length === 0
115
}
84
- >
85
- <View className="bg-card android:gap-3 android:rounded-[20px] android:p-4 ios:gap-2 ios:rounded-[18px] ios:border ios:border-border ios:px-4 ios:py-4">
86
- <Text className="android:text-foreground android:text-base android:font-t3-medium ios:text-foreground-secondary ios:text-2xs ios:font-t3-bold ios:tracking-[1px] ios:uppercase">
87
- New branch
88
- </Text>
89
- <TextInput
90
- value={newBranchName}
91
- onChangeText={setNewBranchName}
92
- placeholder="feature/mobile-polish"
93
- accessibilityLabel="New branch name"
94
- className="android:rounded-xl android:bg-sheet-solid ios:rounded-[18px]"
95
- />
96
- <SheetActionButton
97
- icon="plus"
98
- label="Create & checkout"
99
- tone="primary"
100
- disabled={!canChangeThreadBranch || busy || newBranchName.trim().length === 0}
116
+ onPress={() => {
117
+ const baseBranch = worktreeBaseBranch.trim();
118
+ const newBranch = worktreeBranchName.trim();
119
+ if (baseBranch.length === 0 || newBranch.length === 0) return;
120
+ void gitActions
121
+ .onCreateSelectedThreadWorktree({ baseBranch, newBranch })
122
+ .then((result) => {
123
+ if (result === null) return;
124
+ setWorktreeBranchName("");
125
+ navigation.goBack();
126
+ });
127
+ }}
128
+ />
129
+ </FormSection>
130
+
131
+ <ListSection
132
+ title="Existing branches"
133
+ footer={
134
+ branchesLoading
135
+ ? "Loading branches..."
136
+ : availableBranches.length === 0
137
+ ? "No local branches found."
138
+ : undefined
139
+ }
140
+ >
141
+ {availableBranches.map((branch, index) => {
142
+ const disabled = disabledExistingBranches.has(branch.name);
143
+ const subtitle = branch.worktreePath
144
+ ? branch.worktreePath === currentWorktreePath
145
+ ? "Checked out in this thread"
146
+ : "Checked out in another worktree"
147
+ : branch.isDefault
148
+ ? "Default branch"
149
+ : "Local branch";
150
+
151
+ return (
152
+ <ListChoiceRow
153
+ key={branch.name}
154
+ label={branch.name}
155
+ description={subtitle}
156
+ selected={branch.current}
157
+ separated={index > 0}
158
+ disabled={!canChangeThreadBranch || busy || disabled}
159
onPress={() => {
102
- const branch = sanitizeFeatureBranchName(newBranchName.trim());
103
- if (branch.length === 0) return;
104
- void gitActions.onCreateSelectedThreadBranch(branch).then((result) => {
160
+ void gitActions.onCheckoutSelectedThreadBranch(branch.name).then((result) => {
161
if (result === null) return;
106
- setNewBranchName("");
162
navigation.goBack();
163
});
164
}}
165
/>
111
- </View>
112
-
113
- <View className="bg-card android:gap-3 android:rounded-[20px] android:p-4 ios:gap-2 ios:rounded-[18px] ios:border ios:border-border ios:px-4 ios:py-4">
114
- <Text className="android:text-foreground android:text-base android:font-t3-medium ios:text-foreground-secondary ios:text-2xs ios:font-t3-bold ios:tracking-[1px] ios:uppercase">
115
- New worktree
116
- </Text>
117
- {Platform.OS === "android" ? (
118
- <Text className="text-foreground-secondary text-sm">Base branch</Text>
119
- ) : null}
120
- <TextInput
121
- value={worktreeBaseBranch}
122
- onChangeText={setWorktreeBaseBranchOverride}
123
- placeholder="main"
124
- accessibilityLabel="Worktree base branch"
125
- className="android:rounded-xl android:bg-sheet-solid ios:rounded-[18px]"
126
- />
127
- {Platform.OS === "android" ? (
128
- <Text className="text-foreground-secondary text-sm">New branch</Text>
129
- ) : null}
130
- <TextInput
131
- value={worktreeBranchName}
132
- onChangeText={setWorktreeBranchName}
133
- placeholder="feature/mobile-thread"
134
- accessibilityLabel="Worktree branch name"
135
- className="android:rounded-xl android:bg-sheet-solid ios:rounded-[18px]"
136
- />
137
- <SheetActionButton
138
- icon="square.split.2x1"
139
- label="Create worktree"
140
- tone="primary"
141
- disabled={
142
- !canChangeThreadBranch ||
143
- busy ||
144
- worktreeBaseBranch.trim().length === 0 ||
145
- worktreeBranchName.trim().length === 0
146
- }
147
- onPress={() => {
148
- const baseBranch = worktreeBaseBranch.trim();
149
- const newBranch = worktreeBranchName.trim();
150
- if (baseBranch.length === 0 || newBranch.length === 0) return;
151
- void gitActions
152
- .onCreateSelectedThreadWorktree({ baseBranch, newBranch })
153
- .then((result) => {
154
- if (result === null) return;
155
- setWorktreeBranchName("");
156
- navigation.goBack();
157
- });
158
- }}
159
- />
160
- </View>
161
-
162
- <View className="gap-2">
163
- <Text className="text-foreground-secondary android:px-4 android:pb-1 android:pt-3 android:text-sm android:font-t3-medium ios:text-2xs ios:font-t3-bold ios:tracking-[1px] ios:uppercase">
164
- Existing branches
165
- </Text>
166
- {branchesLoading ? (
167
- <Text className="text-foreground-secondary text-sm font-medium android:px-4">
168
- Loading branches...
169
- </Text>
170
- ) : null}
171
- {!branchesLoading && availableBranches.length === 0 ? (
172
- <Text className="text-foreground-secondary text-sm font-medium android:px-4">
173
- No local branches found.
174
- </Text>
175
- ) : null}
176
- {availableBranches.map((branch) => {
177
- const disabled = disabledExistingBranches.has(branch.name);
178
- const subtitle = branch.worktreePath
179
- ? branch.worktreePath === currentWorktreePath
180
- ? "Checked out in this thread"
181
- : "Checked out in another worktree"
182
- : branch.isDefault
183
- ? "Default branch"
184
- : "Local branch";
185
-
186
- return (
187
- <Pressable
188
- key={branch.name}
189
- className={cn(
190
- "gap-1 px-4 py-3 disabled:opacity-[0.45] android:rounded-[20px] android:active:bg-subtle ios:rounded-[18px] ios:border",
191
- branch.current
192
- ? "android:bg-secondary ios:border-subtle-strong"
193
- : "android:bg-card ios:border-border",
194
- )}
195
- accessibilityRole="button"
196
- accessibilityState={{ selected: branch.current, disabled: busy || disabled }}
197
- disabled={!canChangeThreadBranch || busy || disabled}
198
- onPress={() => {
199
- void gitActions.onCheckoutSelectedThreadBranch(branch.name).then((result) => {
200
- if (result === null) return;
201
- navigation.goBack();
202
- });
203
- }}
204
- >
205
- {Platform.OS !== "android" ? (
206
- <View className="absolute inset-0 rounded-[18px] bg-card" />
207
- ) : null}
208
- <Text className="text-foreground text-base android:font-t3-medium ios:font-t3-bold">
209
- {branch.name}
210
- </Text>
211
- <Text className="text-foreground-secondary text-xs font-medium">{subtitle}</Text>
212
- </Pressable>
213
- );
214
- })}
215
- </View>
216
- </ScrollView>
217
- </ScreenContent>
218
- <SheetHeader title="Branches & worktrees" onClose={() => navigation.goBack()} />
219
- </View>
166
+ );
167
+ })}
168
+ </ListSection>
169
+ </FitSheet>
170
);
171
}
apps/mobile/src/features/threads/git/GitCommitSheet.tsx
+138
-160
@@ -1,11 +1,10 @@
1
-import { ScreenContent } from "../../../components/ui/ScreenContent";
1
+import { FitSheet } from "../../../components/ui/FitSheet";
2
import { SheetHeader } from "../../../components/ui/SheetHeader";
3
import { Button } from "../../../components/ui/Button";
4
import { useNavigation, type StaticScreenProps } from "@react-navigation/native";
5
import { useState } from "react";
6
-import { Platform, Pressable, ScrollView, useWindowDimensions, View } from "react-native";
6
+import { Pressable, View } from "react-native";
7
import { formatDiffCount } from "@t3tools/client-runtime/diff-count";
8
-import { useSafeAreaInsets } from "react-native-safe-area-context";
8
9
import { SymbolView } from "../../../components/ui/AppSymbol";
10
import { AppText as Text, AppTextInput as TextInput } from "../../../components/ui/AppText";
@@ -24,8 +23,6 @@ type GitCommitSheetProps = StaticScreenProps<{
23
24
export function GitCommitSheet(_props: GitCommitSheetProps) {
25
const navigation = useNavigation();
27
- const insets = useSafeAreaInsets();
28
- const { height: windowHeight } = useWindowDimensions();
26
const { selectedThread } = useThreadSelection();
27
const { selectedThreadCwd } = useSelectedThreadWorktree();
28
const gitState = useSelectedThreadGitState();
@@ -66,168 +63,149 @@ export function GitCommitSheet(_props: GitCommitSheetProps) {
63
});
64
};
65
69
- const android = Platform.OS === "android";
70
- const header = (
71
- <SheetHeader
72
- title="Commit changes"
73
- subtitle={gitStatus.data?.refName ?? "(detached HEAD)"}
74
- onCancel={() => navigation.goBack()}
75
- accessibilityLabel="Cancel commit"
76
- />
77
- );
78
-
66
return (
80
- // Material sheet drags follow the first nested-scrolling native view, and the inline
81
- // header's Compose button is one, so Android renders content first and reverses the column.
82
- <View
83
- collapsable={false}
84
- className="bg-sheet ios:flex-1 android:flex-col-reverse"
85
- style={android ? { maxHeight: windowHeight * 0.92 } : undefined}
67
+ <FitSheet
68
+ header={
69
+ <SheetHeader
70
+ title="Commit changes"
71
+ subtitle={gitStatus.data?.refName ?? "(detached HEAD)"}
72
+ onCancel={() => navigation.goBack()}
73
+ accessibilityLabel="Cancel commit"
74
+ />
75
+ }
76
+ keyboardShouldPersistTaps="handled"
77
+ keyboardDismissMode="on-drag"
78
+ automaticallyAdjustKeyboardInsets
79
+ contentContainerClassName="px-5 pt-4 gap-5"
80
>
87
- <ScreenContent fitToContents>
88
- <ScrollView
89
- nestedScrollEnabled
90
- contentInsetAdjustmentBehavior="automatic"
91
- className="android:shrink android:grow-0 ios:flex-1"
92
- keyboardShouldPersistTaps="handled"
93
- keyboardDismissMode="on-drag"
94
- automaticallyAdjustKeyboardInsets
95
- contentContainerClassName="px-5 pt-4 pb-6 gap-5"
96
- contentContainerStyle={{ paddingBottom: Math.max(insets.bottom, 18) + 18 }}
97
- >
98
- {isDefaultRef ? (
99
- <Text className="text-sm text-warning-foreground">
100
- You’re on the default branch. You can create a new branch when committing.
101
- </Text>
102
- ) : null}
103
- <View className="gap-2">
104
- <Text className="text-sm font-t3-medium text-foreground">Commit message</Text>
105
- <TextInput
106
- multiline
107
- accessibilityLabel="Commit message"
108
- value={dialogCommitMessage}
109
- onChangeText={setDialogCommitMessage}
110
- placeholder="Describe your changes…"
111
- textAlignVertical="top"
112
- className="min-h-24 rounded-xl bg-subtle px-4 py-3 text-base"
113
- />
81
+ {isDefaultRef ? (
82
+ <Text className="text-sm text-warning-foreground">
83
+ You’re on the default branch. You can create a new branch when committing.
84
+ </Text>
85
+ ) : null}
86
+ <View className="gap-2">
87
+ <Text className="text-sm font-t3-medium text-foreground">Commit message</Text>
88
+ <TextInput
89
+ multiline
90
+ accessibilityLabel="Commit message"
91
+ value={dialogCommitMessage}
92
+ onChangeText={setDialogCommitMessage}
93
+ placeholder="Describe your changes…"
94
+ textAlignVertical="top"
95
+ className="min-h-24 rounded-xl bg-subtle px-4 py-3 text-base"
96
+ />
97
+ <Text className="text-xs text-foreground-muted">
98
+ Leave empty to generate a message automatically.
99
+ </Text>
100
+ </View>
101
+ <View>
102
+ <View className="flex-row items-center justify-between gap-2 pb-2">
103
+ <View className="flex-1 gap-1">
104
+ <Text className="text-base font-t3-bold text-foreground">Changed files</Text>
105
<Text className="text-xs text-foreground-muted">
115
- Leave empty to generate a message automatically.
106
+ {selectedFiles.length} of {allFiles.length} selected · +
107
+ {formatDiffCount(selectedInsertions)} −{formatDiffCount(selectedDeletions)}
108
</Text>
109
</View>
118
- <View>
119
- <View className="flex-row items-center justify-between gap-2 pb-2">
120
- <View className="flex-1 gap-1">
121
- <Text className="text-base font-t3-bold text-foreground">Changed files</Text>
122
- <Text className="text-xs text-foreground-muted">
123
- {selectedFiles.length} of {allFiles.length} selected · +
124
- {formatDiffCount(selectedInsertions)} −{formatDiffCount(selectedDeletions)}
125
- </Text>
126
- </View>
127
- {allFiles.length > 0 ? (
128
- <Button
129
- label={allSelected ? "Deselect all" : "Select all"}
130
- tone="text"
131
- onPress={() =>
132
- setExcludedFiles(
133
- allSelected ? new Set(allFiles.map((file) => file.path)) : new Set(),
134
- )
135
- }
136
- />
137
- ) : null}
138
- </View>
139
- {allFiles.length === 0 ? (
140
- <Text className="py-4 text-sm text-foreground-muted">
141
- No changed files to commit.
142
- </Text>
143
- ) : (
144
- allFiles.map((file) => {
145
- const included = !excludedFiles.has(file.path);
146
- const slash = file.path.lastIndexOf("/");
147
- const name = file.path.slice(slash + 1);
148
- const directory = slash >= 0 ? file.path.slice(0, slash) : null;
149
- return (
150
- <Pressable
151
- key={file.path}
152
- className="min-h-16 flex-row items-center gap-3 border-t border-border-subtle py-3"
153
- accessibilityRole="checkbox"
154
- accessibilityLabel={file.path}
155
- accessibilityState={{ checked: included }}
156
- onPress={() =>
157
- setExcludedFiles((current) => {
158
- const next = new Set(current);
159
- if (next.has(file.path)) next.delete(file.path);
160
- else next.add(file.path);
161
- return next;
162
- })
163
- }
164
- >
165
- <View
166
- className={cn(
167
- "size-5 items-center justify-center rounded-full",
168
- included ? "bg-primary" : "border border-input-border",
169
- )}
170
- >
171
- {included ? (
172
- <SymbolView
173
- name="checkmark"
174
- size={13}
175
- tintColorClassName="accent-primary-foreground"
176
- />
177
- ) : null}
178
- </View>
179
- <View className="flex-1 gap-1">
180
- <Text
181
- numberOfLines={1}
182
- ellipsizeMode="middle"
183
- className="text-sm font-t3-medium text-foreground"
184
- >
185
- {name}
186
- </Text>
187
- {directory ? (
188
- <Text
189
- numberOfLines={1}
190
- ellipsizeMode="middle"
191
- className="text-xs text-foreground-muted"
192
- >
193
- {directory}
194
- </Text>
195
- ) : null}
196
- </View>
197
- <View className="flex-row gap-2">
198
- <Text className="text-xs text-adaptive-emerald-700-300">
199
- +{formatDiffCount(file.insertions)}
200
- </Text>
201
- <Text className="text-xs text-adaptive-rose-700-300">
202
- −{formatDiffCount(file.deletions)}
203
- </Text>
204
- </View>
205
- </Pressable>
206
- );
207
- })
208
- )}
209
- </View>
210
- <View className="gap-2">
211
- <Button
212
- label="Commit changes"
213
- icon="checkmark"
214
- tone="primary"
215
- fullWidth
216
- disabled={!canWriteSourceControl || noneSelected || busy}
217
- onPress={() => void runCommitAction(false)}
218
- />
110
+ {allFiles.length > 0 ? (
111
<Button
220
- label="Commit on a new branch"
221
- icon="arrow.branch"
112
+ label={allSelected ? "Deselect all" : "Select all"}
113
tone="text"
223
- fullWidth
224
- disabled={!canWriteSourceControl || !canChangeThreadBranch || noneSelected || busy}
225
- onPress={() => void runCommitAction(true)}
114
+ onPress={() =>
115
+ setExcludedFiles(
116
+ allSelected ? new Set(allFiles.map((file) => file.path)) : new Set(),
117
+ )
118
+ }
119
/>
227
- </View>
228
- </ScrollView>
229
- </ScreenContent>
230
- {header}
231
- </View>
120
+ ) : null}
121
+ </View>
122
+ {allFiles.length === 0 ? (
123
+ <Text className="py-4 text-sm text-foreground-muted">No changed files to commit.</Text>
124
+ ) : (
125
+ allFiles.map((file) => {
126
+ const included = !excludedFiles.has(file.path);
127
+ const slash = file.path.lastIndexOf("/");
128
+ const name = file.path.slice(slash + 1);
129
+ const directory = slash >= 0 ? file.path.slice(0, slash) : null;
130
+ return (
131
+ <Pressable
132
+ key={file.path}
133
+ className="min-h-16 flex-row items-center gap-3 border-t border-border-subtle py-3"
134
+ accessibilityRole="checkbox"
135
+ accessibilityLabel={file.path}
136
+ accessibilityState={{ checked: included }}
137
+ onPress={() =>
138
+ setExcludedFiles((current) => {
139
+ const next = new Set(current);
140
+ if (next.has(file.path)) next.delete(file.path);
141
+ else next.add(file.path);
142
+ return next;
143
+ })
144
+ }
145
+ >
146
+ <View
147
+ className={cn(
148
+ "size-5 items-center justify-center rounded-full",
149
+ included ? "bg-primary" : "border border-input-border",
150
+ )}
151
+ >
152
+ {included ? (
153
+ <SymbolView
154
+ name="checkmark"
155
+ size={13}
156
+ tintColorClassName="accent-primary-foreground"
157
+ />
158
+ ) : null}
159
+ </View>
160
+ <View className="flex-1 gap-1">
161
+ <Text
162
+ numberOfLines={1}
163
+ ellipsizeMode="middle"
164
+ className="text-sm font-t3-medium text-foreground"
165
+ >
166
+ {name}
167
+ </Text>
168
+ {directory ? (
169
+ <Text
170
+ numberOfLines={1}
171
+ ellipsizeMode="middle"
172
+ className="text-xs text-foreground-muted"
173
+ >
174
+ {directory}
175
+ </Text>
176
+ ) : null}
177
+ </View>
178
+ <View className="flex-row gap-2">
179
+ <Text className="text-xs text-adaptive-emerald-700-300">
180
+ +{formatDiffCount(file.insertions)}
181
+ </Text>
182
+ <Text className="text-xs text-adaptive-rose-700-300">
183
+ −{formatDiffCount(file.deletions)}
184
+ </Text>
185
+ </View>
186
+ </Pressable>
187
+ );
188
+ })
189
+ )}
190
+ </View>
191
+ <View className="gap-2">
192
+ <Button
193
+ label="Commit changes"
194
+ icon="checkmark"
195
+ tone="primary"
196
+ fullWidth
197
+ disabled={!canWriteSourceControl || noneSelected || busy}
198
+ onPress={() => void runCommitAction(false)}
199
+ />
200
+ <Button
201
+ label="Commit on a new branch"
202
+ icon="arrow.branch"
203
+ tone="text"
204
+ fullWidth
205
+ disabled={!canWriteSourceControl || !canChangeThreadBranch || noneSelected || busy}
206
+ onPress={() => void runCommitAction(true)}
207
+ />
208
+ </View>
209
+ </FitSheet>
210
);
211
}
apps/mobile/src/features/threads/git/GitConfirmSheet.tsx
+27
-62
@@ -5,13 +5,11 @@ import * as Arr from "effect/Array";
5
import * as Result from "effect/Result";
6
import { StackActions, useNavigation, type StaticScreenProps } from "@react-navigation/native";
7
import { useCallback, useMemo } from "react";
8
-import { Platform, ScrollView, useWindowDimensions, View } from "react-native";
9
-
10
-import { useSafeAreaInsets } from "react-native-safe-area-context";
8
+import { View } from "react-native";
9
10
import { SheetHeader } from "../../../components/ui/SheetHeader";
13
-import { ScreenContent } from "../../../components/ui/ScreenContent";
14
-import { AppText as Text } from "../../../components/ui/AppText";
11
+import { FitSheet } from "../../../components/ui/FitSheet";
12
+import { SheetIntro } from "../../../components/ui/SheetIntro";
13
import { useSelectedThreadGitActions } from "../../../state/use-selected-thread-git-actions";
14
import { useSelectedThreadGitState } from "../../../state/use-selected-thread-git-state";
15
import { useThreadSelection } from "../../../state/use-thread-selection";
@@ -29,8 +27,6 @@ type GitConfirmSheetProps = StaticScreenProps<{
27
28
export function GitConfirmSheet(props: GitConfirmSheetProps) {
29
const navigation = useNavigation();
32
- const insets = useSafeAreaInsets();
33
- const { height: windowHeight } = useWindowDimensions();
30
const gitState = useSelectedThreadGitState();
31
const gitActions = useSelectedThreadGitActions();
32
const { canWriteSourceControl, canChangeThreadBranch } = gitActions;
@@ -115,62 +111,31 @@ export function GitConfirmSheet(props: GitConfirmSheetProps) {
111
]);
112
113
return (
118
- <View
119
- collapsable={false}
120
- className="bg-sheet ios:flex-1 android:flex-col-reverse"
121
- style={Platform.OS === "android" ? { maxHeight: windowHeight * 0.92 } : undefined}
114
+ <FitSheet
115
+ header={<SheetHeader title="Confirm action" onClose={() => navigation.goBack()} />}
116
+ showsVerticalScrollIndicator={false}
117
>
123
- <ScreenContent fitToContents>
124
- <ScrollView
125
- nestedScrollEnabled
126
- className="android:shrink android:grow-0 ios:flex-1"
127
- showsVerticalScrollIndicator={false}
128
- contentContainerClassName="android:gap-2 android:p-2"
129
- contentContainerStyle={
130
- Platform.OS === "android"
131
- ? { paddingBottom: Math.max(insets.bottom, 18) + 8 }
132
- : undefined
133
- }
134
- >
135
- <View className="android:gap-2 android:rounded-[20px] android:bg-card android:p-3 ios:items-center ios:gap-1 ios:px-5 ios:pb-3 ios:pt-4">
136
- {Platform.OS !== "android" ? (
137
- <Text className="text-xs font-t3-bold tracking-[1px] uppercase text-foreground-muted">
138
- Confirm
139
- </Text>
140
- ) : null}
141
- <Text className="android:text-xl android:font-t3-medium ios:text-center ios:text-3xl ios:font-t3-bold">
142
- {copy?.title ?? "Run action on default branch?"}
143
- </Text>
144
- <Text className="text-foreground-secondary leading-normal android:text-base ios:text-center ios:text-sm ios:font-medium">
145
- {copy?.description ?? "Choose how to continue."}
146
- </Text>
147
- </View>
118
+ <SheetIntro
119
+ eyebrow="Confirm"
120
+ title={copy?.title ?? "Run action on default branch?"}
121
+ description={copy?.description ?? "Choose how to continue."}
122
+ />
123
149
- <View
150
- className="android:gap-2 ios:gap-3 ios:px-5 ios:pt-2"
151
- style={
152
- Platform.OS === "android"
153
- ? undefined
154
- : { paddingBottom: Math.max(insets.bottom, 18) + 8 }
155
- }
156
- >
157
- <SheetActionButton
158
- icon="arrow.right.circle"
159
- label={copy?.continueLabel ?? "Continue"}
160
- disabled={!canWriteSourceControl}
161
- onPress={() => void continuePendingAction()}
162
- />
163
- <SheetActionButton
164
- icon="arrow.branch"
165
- label="Feature branch & continue"
166
- disabled={!canChangeThreadBranch}
167
- tone="primary"
168
- onPress={() => void movePendingActionToFeatureBranch()}
169
- />
170
- </View>
171
- </ScrollView>
172
- </ScreenContent>
173
- <SheetHeader title="Confirm action" onClose={() => navigation.goBack()} />
174
- </View>
124
+ <View className="gap-3">
125
+ <SheetActionButton
126
+ icon="arrow.right.circle"
127
+ label={copy?.continueLabel ?? "Continue"}
128
+ disabled={!canWriteSourceControl}
129
+ onPress={() => void continuePendingAction()}
130
+ />
131
+ <SheetActionButton
132
+ icon="arrow.branch"
133
+ label="Feature branch & continue"
134
+ disabled={!canChangeThreadBranch}
135
+ tone="primary"
136
+ onPress={() => void movePendingActionToFeatureBranch()}
137
+ />
138
+ </View>
139
+ </FitSheet>
140
);
141
}
apps/mobile/src/features/threads/git/GitOverviewSheet.tsx
+7
-13
@@ -1,5 +1,4 @@
1
import * as Dialog from "../../../components/ui/Dialog";
2
-import { cn } from "../../../lib/cn";
2
import { useOpenPullRequest } from "../../../native/useOpenPullRequest";
3
import {
4
type GitActionRequestInput,
@@ -16,14 +15,16 @@ import {
15
type StaticScreenProps,
16
} from "@react-navigation/native";
17
import { use, useEffect, useState } from "react";
19
-import { Platform, RefreshControl, View } from "react-native";
18
+import { RefreshControl } from "../../../components/ui/RefreshControl";
19
import { NativeScrollView } from "../../../native/NativeScrollViewMarker";
20
21
import { useSafeAreaInsets } from "react-native-safe-area-context";
22
import { AppBar } from "../../../components/ui/AppBar";
23
import { ListRow } from "../../../components/ui/ListRow";
24
import { ListSection } from "../../../components/ui/ListSection";
25
+import { groupedListInsets } from "../../../components/ui/listMetrics";
26
import { ScreenContent } from "../../../components/ui/ScreenContent";
27
+import { SheetPane } from "../../../components/ui/SheetPane";
28
import { InspectorSheetContext } from "../../layout/workspace-inspector-sheet";
29
import { AppText as Text } from "../../../components/ui/AppText";
30
import { useEnvironmentQuery } from "../../../state/query";
@@ -231,15 +232,11 @@ function GitOverviewSheetContent(props: GitOverviewSheetProps) {
232
<NativeScrollView
233
nestedScrollEnabled
234
alwaysBounceVertical
234
- className="flex-1 android:bg-sheet-solid ios:bg-screen"
235
+ className="flex-1 bg-screen"
236
contentInsetAdjustmentBehavior="automatic"
237
showsVerticalScrollIndicator={false}
238
contentInset={{ bottom: Math.max(insets.bottom, 18) + 18 }}
238
- contentContainerStyle={{
239
- paddingHorizontal: Platform.OS === "android" ? 8 : isInspector ? 12 : 20,
240
- paddingTop: 8,
241
- gap: Platform.OS === "android" ? 8 : 14,
242
- }}
239
+ contentContainerStyle={{ ...groupedListInsets(isInspector), paddingTop: 8 }}
240
refreshControl={
241
<RefreshControl refreshing={isRefreshing} onRefresh={() => void handleRefresh()} />
242
}
@@ -344,10 +341,7 @@ function GitOverviewSheetContent(props: GitOverviewSheetProps) {
341
};
342
343
return (
347
- <View
348
- collapsable={false}
349
- className={cn("flex-1 android:bg-header", isInspector ? "ios:bg-screen" : "ios:bg-sheet")}
350
- >
344
+ <SheetPane surface={isInspector ? "screen" : "sheet"}>
345
<AppBar
346
title={currentBranchLabel}
347
subtitle={currentStatusSummary}
@@ -356,6 +350,6 @@ function GitOverviewSheetContent(props: GitOverviewSheetProps) {
350
refresh={refresh}
351
/>
352
<ScreenContent insetHorizontal={isInspector ? true : undefined}>{content}</ScreenContent>
359
- </View>
353
+ </SheetPane>
354
);
355
}
apps/mobile/src/features/usage/UsageRouteScreen.tsx
+2
-1
@@ -28,7 +28,8 @@ import {
28
usageSourceMessages,
29
} from "@t3tools/shared/usageFormat";
30
import { useRef, useState, type ReactNode } from "react";
31
-import { RefreshControl, View } from "react-native";
31
+import { View } from "react-native";
32
+import { RefreshControl } from "../../components/ui/RefreshControl";
33
import Animated, { FadeIn, ReduceMotion } from "react-native-reanimated";
34
import { useSafeAreaInsets } from "react-native-safe-area-context";
35
docs/operations/mobile-screens-fork.md
+1
-1
@@ -1,7 +1,7 @@
1
# Building the mobile Screens dependency
2
3
The mobile v5 stack uses a committed tarball from the
4
-[T3 Screens fork](https://github.com/pingdotgg/react-native-screens/tree/t3-v5.0.0-t3.45).
4
+[T3 Screens fork](https://github.com/pingdotgg/react-native-screens/tree/t3-v5.0.0-t3.50).
5
The fork owns the integration changes; the app does not patch this package.
6
Each archive includes compiled JavaScript, declarations, native source and
7
`t3-fork.json` recording its version, source commit and upstream base.
patches/@expo__ui@58.0.27.patch
new
+24
@@ -0,0 +1,24 @@
1
+diff --git a/android/src/main/java/expo/modules/ui/RNHostView.kt b/android/src/main/java/expo/modules/ui/RNHostView.kt
2
+--- a/android/src/main/java/expo/modules/ui/RNHostView.kt
3
++++ b/android/src/main/java/expo/modules/ui/RNHostView.kt
4
+@@ -847,7 +847,19 @@
5
+ override fun setNestedScrollingEnabled(enabled: Boolean) {
6
+ childHelper.isNestedScrollingEnabled = enabled
7
+ }
8
+- override fun isNestedScrollingEnabled(): Boolean = childHelper.isNestedScrollingEnabled
9
++ // Relaying above only needs the helper's flag. Views that look for a scroll target, like
10
++ // Material's BottomSheetBehavior, read this one, so a host of buttons must not claim to scroll.
11
++ override fun isNestedScrollingEnabled(): Boolean =
12
++ childHelper.isNestedScrollingEnabled && hasNestedScrollingDescendant(this)
13
++
14
++ private fun hasNestedScrollingDescendant(group: ViewGroup): Boolean {
15
++ for (index in 0 until group.childCount) {
16
++ val child = group.getChildAt(index)
17
++ if (child.isNestedScrollingEnabled) return true
18
++ if (child is ViewGroup && hasNestedScrollingDescendant(child)) return true
19
++ }
20
++ return false
21
++ }
22
+ override fun startNestedScroll(axes: Int): Boolean = childHelper.startNestedScroll(axes)
23
+ override fun startNestedScroll(axes: Int, type: Int): Boolean = childHelper.startNestedScroll(axes, type)
24
+ override fun stopNestedScroll() = childHelper.stopNestedScroll()
pnpm-lock.yaml
+14
-13
@@ -363,6 +363,7 @@ patchedDependencies:
363
'@clerk/expo-native-components@0.4.4': 7a808b92da8460750b85818552e13be3fb73d111691c7db76965970351e124e4
364
'@cursor/sdk@1.2.0': 57f502128bf6accd976963b126e227c86a45d815a53a8dc450461beae3bed4a4
365
'@effect/vitest@4.1.2': 299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7
366
+ '@expo/ui@58.0.27': 9f2547678939f4ec78fe45163b6455aad63d3c80353d7e0cc783f6a61a7ccc2f
367
'@ff-labs/fff-node@0.11.0': a71dc3a5544fc47afacf0fe9da04dccec3018e625a76c96087ebfdf35e293768
368
'@legendapp/list@3.7.2': 3c68607b8bb7a531873bcbe0b197d163ef1fdb4d4cf52a4ddf9d2b3804671658
369
'@muse-code/sdk@1.4.6': 7b495b607fc5d76b444c7c4d58821e839726a30e6f3c53564f0d59f2d5b42101
@@ -549,7 +550,7 @@ importers:
550
version: 58.0.17(@expo/log-box@58.0.15)(expo@58.0.23)(react-dom@19.3.0(react@19.3.0))(react-native@0.88.1(@babel/core@7.29.7(supports-color@8.1.1))(@react-native/metro-config@0.88.1(@babel/core@7.29.7(supports-color@8.1.1))(bufferutil@4.1.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(@types/react@19.3.0)(bufferutil@4.1.0)(react@19.3.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(react@19.3.0)
551
'@expo/ui':
552
specifier: 58.0.27
552
- version: 58.0.27(@babel/core@7.29.7(supports-color@8.1.1))(expo@58.0.23)(react-dom@19.3.0(react@19.3.0))(react-native-worklets@0.13.1(@babel/core@7.29.7(supports-color@8.1.1))(@react-native/metro-config@0.88.1(@babel/core@7.29.7(supports-color@8.1.1))(bufferutil@4.1.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(react-native@0.88.1(@babel/core@7.29.7(supports-color@8.1.1))(@react-native/metro-config@0.88.1(@babel/core@7.29.7(supports-color@8.1.1))(bufferutil@4.1.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(@types/react@19.3.0)(bufferutil@4.1.0)(react@19.3.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(react@19.3.0)(supports-color@8.1.1))(react-native@0.88.1(@babel/core@7.29.7(supports-color@8.1.1))(@react-native/metro-config@0.88.1(@babel/core@7.29.7(supports-color@8.1.1))(bufferutil@4.1.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(@types/react@19.3.0)(bufferutil@4.1.0)(react@19.3.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(react@19.3.0)
553
+ version: 58.0.27(patch_hash=9f2547678939f4ec78fe45163b6455aad63d3c80353d7e0cc783f6a61a7ccc2f)(@babel/core@7.29.7(supports-color@8.1.1))(expo@58.0.23)(react-dom@19.3.0(react@19.3.0))(react-native-worklets@0.13.1(@babel/core@7.29.7(supports-color@8.1.1))(@react-native/metro-config@0.88.1(@babel/core@7.29.7(supports-color@8.1.1))(bufferutil@4.1.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(react-native@0.88.1(@babel/core@7.29.7(supports-color@8.1.1))(@react-native/metro-config@0.88.1(@babel/core@7.29.7(supports-color@8.1.1))(bufferutil@4.1.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(@types/react@19.3.0)(bufferutil@4.1.0)(react@19.3.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(react@19.3.0)(supports-color@8.1.1))(react-native@0.88.1(@babel/core@7.29.7(supports-color@8.1.1))(@react-native/metro-config@0.88.1(@babel/core@7.29.7(supports-color@8.1.1))(bufferutil@4.1.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(@types/react@19.3.0)(bufferutil@4.1.0)(react@19.3.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(react@19.3.0)
554
'@formatjs/intl-displaynames':
555
specifier: 6.8.13
556
version: 6.8.13
@@ -585,7 +586,7 @@ importers:
586
version: 7.5.1(react-native@0.88.1(@babel/core@7.29.7(supports-color@8.1.1))(@react-native/metro-config@0.88.1(@babel/core@7.29.7(supports-color@8.1.1))(bufferutil@4.1.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(@types/react@19.3.0)(bufferutil@4.1.0)(react@19.3.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(react@19.3.0)
587
'@react-navigation/native-stack':
588
specifier: 7.21.0
588
- version: 7.21.0(patch_hash=990d575444c4af2ce8218b3b7a8280fe244c03abbdb32b822a2e862f791dbf42)(bce9d5917b75ecfdccb2630d9f614f34)
589
+ version: 7.21.0(patch_hash=990d575444c4af2ce8218b3b7a8280fe244c03abbdb32b822a2e862f791dbf42)(8cabb04b1defcb22245317e78e4e5f29)
590
'@t3tools/client-runtime':
591
specifier: workspace:*
592
version: link:../../packages/client-runtime
@@ -773,8 +774,8 @@ importers:
774
specifier: ~5.11.1
775
version: 5.11.1(react-native@0.88.1(@babel/core@7.29.7(supports-color@8.1.1))(@react-native/metro-config@0.88.1(@babel/core@7.29.7(supports-color@8.1.1))(bufferutil@4.1.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(@types/react@19.3.0)(bufferutil@4.1.0)(react@19.3.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(react@19.3.0)
776
react-native-screens:
776
- specifier: file:deps/react-native-screens-5.0.0-t3.48.tgz
777
- version: file:apps/mobile/deps/react-native-screens-5.0.0-t3.48.tgz(react-native@0.88.1(@babel/core@7.29.7(supports-color@8.1.1))(@react-native/metro-config@0.88.1(@babel/core@7.29.7(supports-color@8.1.1))(bufferutil@4.1.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(@types/react@19.3.0)(bufferutil@4.1.0)(react@19.3.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(react@19.3.0)
777
+ specifier: file:deps/react-native-screens-5.0.0-t3.50.tgz
778
+ version: file:apps/mobile/deps/react-native-screens-5.0.0-t3.50.tgz(react-native@0.88.1(@babel/core@7.29.7(supports-color@8.1.1))(@react-native/metro-config@0.88.1(@babel/core@7.29.7(supports-color@8.1.1))(bufferutil@4.1.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(@types/react@19.3.0)(bufferutil@4.1.0)(react@19.3.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(react@19.3.0)
779
react-native-svg:
780
specifier: 15.16.1
781
version: 15.16.1(patch_hash=110f9243ffad03654ce40dd1cdb09f01af16b8fa2ccb2b2cd3d62e682c180399)(react-native@0.88.1(@babel/core@7.29.7(supports-color@8.1.1))(@react-native/metro-config@0.88.1(@babel/core@7.29.7(supports-color@8.1.1))(bufferutil@4.1.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(@types/react@19.3.0)(bufferutil@4.1.0)(react@19.3.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(react@19.3.0)
@@ -11587,9 +11588,9 @@ packages:
11588
react: '*'
11589
react-native: '*'
11590
11590
- react-native-screens@file:apps/mobile/deps/react-native-screens-5.0.0-t3.48.tgz:
11591
- resolution: {integrity: sha512-DQa7yVsOye72bUNH4UVC3D8QicmOm+LMFLpZui6ZEnwU5wtlyEsqFX26kKSvDkpByAffQVIqqJ3s0QNCGNwF1A==, tarball: file:apps/mobile/deps/react-native-screens-5.0.0-t3.48.tgz}
11592
- version: 5.0.0-t3.48
11591
+ react-native-screens@file:apps/mobile/deps/react-native-screens-5.0.0-t3.50.tgz:
11592
+ resolution: {integrity: sha512-APO5MIX4Bf842vXuChMsL/5GTC+Xl5GQEl48QBOgUJkEGibpmU54HZ+jWWDvnIqqQyzYntKF/iK7OCSR+S4xSg==, tarball: file:apps/mobile/deps/react-native-screens-5.0.0-t3.50.tgz}
11593
+ version: 5.0.0-t3.50
11594
peerDependencies:
11595
react: '*'
11596
react-native: '*'
@@ -15099,8 +15100,8 @@ snapshots:
15100
15101
'@expo/sudo-prompt@9.3.2': {}
15102
15102
- '@expo/ui@58.0.27(@babel/core@7.29.7(supports-color@8.1.1))(expo@58.0.23)(react-dom@19.3.0(react@19.3.0))(react-native-worklets@0.13.1(@babel/core@7.29.7(supports-color@8.1.1))(@react-native/metro-config@0.88.1(@babel/core@7.29.7(supports-color@8.1.1))(bufferutil@4.1.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(react-native@0.88.1(@babel/core@7.29.7(supports-color@8.1.1))(@react-native/metro-config@0.88.1(@babel/core@7.29.7(supports-color@8.1.1))(bufferutil@4.1.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(@types/react@19.3.0)(bufferutil@4.1.0)(react@19.3.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(react@19.3.0)(supports-color@8.1.1))(react-native@0.88.1(@babel/core@7.29.7(supports-color@8.1.1))(@react-native/metro-config@0.88.1(@babel/core@7.29.7(supports-color@8.1.1))(bufferutil@4.1.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(@types/react@19.3.0)(bufferutil@4.1.0)(react@19.3.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(react@19.3.0)':
15103
- dependencies:
15103
+ ? '@expo/ui@58.0.27(patch_hash=9f2547678939f4ec78fe45163b6455aad63d3c80353d7e0cc783f6a61a7ccc2f)(@babel/core@7.29.7(supports-color@8.1.1))(expo@58.0.23)(react-dom@19.3.0(react@19.3.0))(react-native-worklets@0.13.1(@babel/core@7.29.7(supports-color@8.1.1))(@react-native/metro-config@0.88.1(@babel/core@7.29.7(supports-color@8.1.1))(bufferutil@4.1.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(react-native@0.88.1(@babel/core@7.29.7(supports-color@8.1.1))(@react-native/metro-config@0.88.1(@babel/core@7.29.7(supports-color@8.1.1))(bufferutil@4.1.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(@types/react@19.3.0)(bufferutil@4.1.0)(react@19.3.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(react@19.3.0)(supports-color@8.1.1))(react-native@0.88.1(@babel/core@7.29.7(supports-color@8.1.1))(@react-native/metro-config@0.88.1(@babel/core@7.29.7(supports-color@8.1.1))(bufferutil@4.1.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(@types/react@19.3.0)(bufferutil@4.1.0)(react@19.3.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(react@19.3.0)'
15104
+ : dependencies:
15105
expo: 58.0.23(d226faf1ca90e630d8c56a2108dee32d)
15106
react: 19.3.0
15107
react-native: 0.88.1(@babel/core@7.29.7(supports-color@8.1.1))(@react-native/metro-config@0.88.1(@babel/core@7.29.7(supports-color@8.1.1))(bufferutil@4.1.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(@types/react@19.3.0)(bufferutil@4.1.0)(react@19.3.0)(supports-color@8.1.1)(utf-8-validate@6.0.6)
@@ -16651,7 +16652,7 @@ snapshots:
16652
optionalDependencies:
16653
'@react-native-masked-view/masked-view': 0.3.2(react-native@0.88.1(@babel/core@7.29.7(supports-color@8.1.1))(@react-native/metro-config@0.88.1(@babel/core@7.29.7(supports-color@8.1.1))(bufferutil@4.1.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(@types/react@19.3.0)(bufferutil@4.1.0)(react@19.3.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(react@19.3.0)
16654
16654
- '@react-navigation/native-stack@7.21.0(patch_hash=990d575444c4af2ce8218b3b7a8280fe244c03abbdb32b822a2e862f791dbf42)(bce9d5917b75ecfdccb2630d9f614f34)':
16655
+ '@react-navigation/native-stack@7.21.0(patch_hash=990d575444c4af2ce8218b3b7a8280fe244c03abbdb32b822a2e862f791dbf42)(8cabb04b1defcb22245317e78e4e5f29)':
16656
dependencies:
16657
'@react-navigation/elements': 2.9.45(83450c2b8dad8f97d4bec4849f35b99e)
16658
'@react-navigation/native': 7.5.1(react-native@0.88.1(@babel/core@7.29.7(supports-color@8.1.1))(@react-native/metro-config@0.88.1(@babel/core@7.29.7(supports-color@8.1.1))(bufferutil@4.1.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(@types/react@19.3.0)(bufferutil@4.1.0)(react@19.3.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(react@19.3.0)
@@ -16659,7 +16660,7 @@ snapshots:
16660
react: 19.3.0
16661
react-native: 0.88.1(@babel/core@7.29.7(supports-color@8.1.1))(@react-native/metro-config@0.88.1(@babel/core@7.29.7(supports-color@8.1.1))(bufferutil@4.1.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(@types/react@19.3.0)(bufferutil@4.1.0)(react@19.3.0)(supports-color@8.1.1)(utf-8-validate@6.0.6)
16662
react-native-safe-area-context: 5.11.1(react-native@0.88.1(@babel/core@7.29.7(supports-color@8.1.1))(@react-native/metro-config@0.88.1(@babel/core@7.29.7(supports-color@8.1.1))(bufferutil@4.1.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(@types/react@19.3.0)(bufferutil@4.1.0)(react@19.3.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(react@19.3.0)
16662
- react-native-screens: file:apps/mobile/deps/react-native-screens-5.0.0-t3.48.tgz(react-native@0.88.1(@babel/core@7.29.7(supports-color@8.1.1))(@react-native/metro-config@0.88.1(@babel/core@7.29.7(supports-color@8.1.1))(bufferutil@4.1.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(@types/react@19.3.0)(bufferutil@4.1.0)(react@19.3.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(react@19.3.0)
16663
+ react-native-screens: file:apps/mobile/deps/react-native-screens-5.0.0-t3.50.tgz(react-native@0.88.1(@babel/core@7.29.7(supports-color@8.1.1))(@react-native/metro-config@0.88.1(@babel/core@7.29.7(supports-color@8.1.1))(bufferutil@4.1.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(@types/react@19.3.0)(bufferutil@4.1.0)(react@19.3.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(react@19.3.0)
16664
sf-symbols-typescript: 2.2.0
16665
warn-once: 0.1.1
16666
transitivePeerDependencies:
@@ -19573,7 +19574,7 @@ snapshots:
19574
? expo-widgets@58.0.27(patch_hash=8bf49067f93742855e15f29559ac75c8b50230b47069060993c9ea01dac11171)(@babel/core@7.29.7(supports-color@8.1.1))(expo@58.0.23)(react-dom@19.3.0(react@19.3.0))(react-native-worklets@0.13.1(@babel/core@7.29.7(supports-color@8.1.1))(@react-native/metro-config@0.88.1(@babel/core@7.29.7(supports-color@8.1.1))(bufferutil@4.1.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(react-native@0.88.1(@babel/core@7.29.7(supports-color@8.1.1))(@react-native/metro-config@0.88.1(@babel/core@7.29.7(supports-color@8.1.1))(bufferutil@4.1.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(@types/react@19.3.0)(bufferutil@4.1.0)(react@19.3.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(react@19.3.0)(supports-color@8.1.1))(react-native@0.88.1(@babel/core@7.29.7(supports-color@8.1.1))(@react-native/metro-config@0.88.1(@babel/core@7.29.7(supports-color@8.1.1))(bufferutil@4.1.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(@types/react@19.3.0)(bufferutil@4.1.0)(react@19.3.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(react@19.3.0)
19575
: dependencies:
19576
'@expo/plist': 0.10.1
19576
- '@expo/ui': 58.0.27(@babel/core@7.29.7(supports-color@8.1.1))(expo@58.0.23)(react-dom@19.3.0(react@19.3.0))(react-native-worklets@0.13.1(@babel/core@7.29.7(supports-color@8.1.1))(@react-native/metro-config@0.88.1(@babel/core@7.29.7(supports-color@8.1.1))(bufferutil@4.1.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(react-native@0.88.1(@babel/core@7.29.7(supports-color@8.1.1))(@react-native/metro-config@0.88.1(@babel/core@7.29.7(supports-color@8.1.1))(bufferutil@4.1.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(@types/react@19.3.0)(bufferutil@4.1.0)(react@19.3.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(react@19.3.0)(supports-color@8.1.1))(react-native@0.88.1(@babel/core@7.29.7(supports-color@8.1.1))(@react-native/metro-config@0.88.1(@babel/core@7.29.7(supports-color@8.1.1))(bufferutil@4.1.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(@types/react@19.3.0)(bufferutil@4.1.0)(react@19.3.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(react@19.3.0)
19577
+ '@expo/ui': 58.0.27(patch_hash=9f2547678939f4ec78fe45163b6455aad63d3c80353d7e0cc783f6a61a7ccc2f)(@babel/core@7.29.7(supports-color@8.1.1))(expo@58.0.23)(react-dom@19.3.0(react@19.3.0))(react-native-worklets@0.13.1(@babel/core@7.29.7(supports-color@8.1.1))(@react-native/metro-config@0.88.1(@babel/core@7.29.7(supports-color@8.1.1))(bufferutil@4.1.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(react-native@0.88.1(@babel/core@7.29.7(supports-color@8.1.1))(@react-native/metro-config@0.88.1(@babel/core@7.29.7(supports-color@8.1.1))(bufferutil@4.1.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(@types/react@19.3.0)(bufferutil@4.1.0)(react@19.3.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(react@19.3.0)(supports-color@8.1.1))(react-native@0.88.1(@babel/core@7.29.7(supports-color@8.1.1))(@react-native/metro-config@0.88.1(@babel/core@7.29.7(supports-color@8.1.1))(bufferutil@4.1.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(@types/react@19.3.0)(bufferutil@4.1.0)(react@19.3.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(react@19.3.0)
19578
expo: 58.0.23(d226faf1ca90e630d8c56a2108dee32d)
19579
react: 19.3.0
19580
react-native: 0.88.1(@babel/core@7.29.7(supports-color@8.1.1))(@react-native/metro-config@0.88.1(@babel/core@7.29.7(supports-color@8.1.1))(bufferutil@4.1.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(@types/react@19.3.0)(bufferutil@4.1.0)(react@19.3.0)(supports-color@8.1.1)(utf-8-validate@6.0.6)
@@ -22508,7 +22509,7 @@ snapshots:
22509
react: 19.3.0
22510
react-native: 0.88.1(@babel/core@7.29.7(supports-color@8.1.1))(@react-native/metro-config@0.88.1(@babel/core@7.29.7(supports-color@8.1.1))(bufferutil@4.1.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(@types/react@19.3.0)(bufferutil@4.1.0)(react@19.3.0)(supports-color@8.1.1)(utf-8-validate@6.0.6)
22511
22511
- react-native-screens@file:apps/mobile/deps/react-native-screens-5.0.0-t3.48.tgz(react-native@0.88.1(@babel/core@7.29.7(supports-color@8.1.1))(@react-native/metro-config@0.88.1(@babel/core@7.29.7(supports-color@8.1.1))(bufferutil@4.1.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(@types/react@19.3.0)(bufferutil@4.1.0)(react@19.3.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(react@19.3.0):
22512
+ react-native-screens@file:apps/mobile/deps/react-native-screens-5.0.0-t3.50.tgz(react-native@0.88.1(@babel/core@7.29.7(supports-color@8.1.1))(@react-native/metro-config@0.88.1(@babel/core@7.29.7(supports-color@8.1.1))(bufferutil@4.1.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(@types/react@19.3.0)(bufferutil@4.1.0)(react@19.3.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(react@19.3.0):
22513
dependencies:
22514
react: 19.3.0
22515
react-freeze: 1.0.4(react@19.3.0)
pnpm-workspace.yaml
+3
@@ -240,6 +240,9 @@ patchedDependencies:
240
"@effect/vitest@4.1.2": patches/@effect__vitest@4.1.2.patch
241
expo-sharing@58.0.22: patches/expo-sharing@58.0.22.patch
242
expo-widgets@58.0.27: patches/expo-widgets@58.0.27.patch
243
+ # Android: an RNHostView without a scrolling descendant (an app bar's buttons) is no longer the
244
+ # scroll target a Material bottom sheet picks, so sheet content can sit below its header.
245
+ "@expo/ui@58.0.27": patches/@expo__ui@58.0.27.patch
246
"@ff-labs/fff-node@0.11.0": patches/@ff-labs__fff-node@0.11.0.patch
247
# Exports the dependency-light subpaths mobile and the web diff parser import, and makes find
248
# cover folded files and collapsed context (onRevealSearchMatch).
vite.config.ts
+6
@@ -51,6 +51,12 @@ const RESTRICTED_IMPORT_PATHS = [
51
message:
52
"Use NativeScrollViewMarker or NativeScrollView (src/native/NativeScrollViewMarker.tsx): they carry the header's scroll-edge blur under the Duo's vertical bar.",
53
},
54
+ {
55
+ name: "react-native",
56
+ importNames: ["RefreshControl"],
57
+ message:
58
+ "Use RefreshControl from src/components/ui/RefreshControl: Android bottom sheets own the pull at the top, so it steps aside there.",
59
+ },
60
];
61
62
const RESTRICTED_UI_VARIANT_PATTERNS = [