Skip to content

Commit 3d94852

Browse files
committed
Merge pt/main into fix/ssh-remote-github-account
2 parents 4fa05b4 + 33f1fe5 commit 3d94852

106 files changed

Lines changed: 4624 additions & 656 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
name: Close stale "needs more info" issues
2+
3+
on:
4+
schedule:
5+
- cron: "17 6 * * *"
6+
workflow_dispatch:
7+
8+
permissions:
9+
actions: write
10+
issues: write
11+
12+
jobs:
13+
stale:
14+
runs-on: ubuntu-latest
15+
steps:
16+
- uses: actions/stale@v9
17+
with:
18+
only-issue-labels: "needs more info"
19+
# The label is applied by the triage flow, so never auto-mark; close 7 days after it was added.
20+
days-before-issue-stale: -1
21+
days-before-issue-close: 7
22+
days-before-pr-stale: -1
23+
days-before-pr-close: -1
24+
remove-issue-stale-when-updated: true
25+
stale-issue-label: "needs more info"
26+
close-issue-reason: not_planned
27+
close-issue-message: >-
28+
Closing: no reply in 7 days after we asked for more information.
29+
Comment with the missing details and we will reopen.
30+
operations-per-run: 200
-769 KB
Binary file not shown.
769 KB
Binary file not shown.

‎apps/mobile/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@
134134
"react-native-pdf-jsi": "5.0.0",
135135
"react-native-reanimated": "4.7.1",
136136
"react-native-safe-area-context": "~5.10.1",
137-
"react-native-screens": "file:deps/react-native-screens-5.0.0-t3.36.tgz",
137+
"react-native-screens": "file:deps/react-native-screens-5.0.0-t3.37.tgz",
138138
"react-native-shiki-engine": "^0.3.12",
139139
"react-native-svg": "15.16.0",
140140
"react-native-webview": "14.0.1",

‎apps/mobile/src/App.tsx‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import { SafeAreaProvider } from "react-native-safe-area-context";
99
import { createStaticNavigation, getStateFromPath } from "@react-navigation/native";
1010

1111
import { RegistryContext } from "@effect/atom-react";
12+
import { ProjectChipIconRasterizer } from "./native/ProjectChipIconImages";
1213
import { ThreadArrangementHost } from "./features/threads/ThreadArrangementSheet";
1314
import * as Dialog from "./components/ui/Dialog";
1415
import { CloudAuthProvider } from "./features/cloud/CloudAuthProvider";
@@ -110,6 +111,7 @@ function AppContent() {
110111
</IncomingShareProvider>
111112
<Dialog.Host />
112113
<ThreadArrangementHost />
114+
<ProjectChipIconRasterizer />
113115
</NativeLayoutMetricsProvider>
114116
</GlobalVoiceInputControl>
115117
{/* Anchored-menu overlays render here — in-window, so the

‎apps/mobile/src/Stack.tsx‎

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ import {
3434
import { PullRequestFilesSheet } from "./features/pull-requests/PullRequestFiles";
3535
import { PullRequestReviewSheet } from "./features/pull-requests/PullRequestReviewSheet";
3636
import { PullRequestReviewersScreen } from "./features/pull-requests/PullRequestReviewersScreen";
37+
import { PullRequestFilterSearchScreen } from "./features/pull-requests/PullRequestFilterSearchScreen";
3738
import {
3839
RenderErrorBoundary,
3940
RenderFailureView,
@@ -147,6 +148,7 @@ const HEADER_SCROLL_EDGE_EFFECTS = nativeHeaderScrollEdgeEffects(Platform.OS, Pl
147148

148149
type AppScreenOptions = NativeStackNavigationOptions & {
149150
readonly unstable_navigationItemStyle?: "editor";
151+
readonly unstable_headerMinimizationBehavior?: "onScrollUp";
150152
};
151153

152154
const GLASS_HEADER_OPTIONS: AppScreenOptions = {
@@ -169,6 +171,13 @@ const DETAIL_HEADER_OPTIONS: AppScreenOptions = {
169171
headerShown: Platform.OS !== "android",
170172
};
171173

174+
// Like Messages on the Duo: reading back through history (scrolling up) minimizes the
175+
// header, and reversing toward the latest message restores it. Other devices ignore it.
176+
const THREAD_HEADER_OPTIONS: AppScreenOptions = {
177+
...DETAIL_HEADER_OPTIONS,
178+
unstable_headerMinimizationBehavior: "onScrollUp",
179+
};
180+
172181
const SOLID_HEADER_OPTIONS: AppScreenOptions = {
173182
headerBackButtonDisplayMode: "minimal",
174183
headerBackTitle: "",
@@ -681,6 +690,21 @@ const RootStackConfig = createWorkspaceStackNavigator({
681690
headerBackVisible: false,
682691
},
683692
}),
693+
PullRequestFilterSearch: createNativeStackScreen({
694+
screen: PullRequestFilterSearchScreen,
695+
// Android pushes it like the branch picker; a formSheet there leaves the list's header
696+
// peeking above it once the keyboard opens.
697+
options:
698+
Platform.OS === "android"
699+
? { presentation: "card", headerShown: false }
700+
: {
701+
...DETAIL_HEADER_OPTIONS,
702+
...HORIZONTAL_FORM_SHEET_OPTIONS,
703+
sheetAllowedDetents: formSheetDetents(0.75),
704+
sheetGrabberVisible: true,
705+
headerBackVisible: false,
706+
},
707+
}),
684708
PullRequestDiscussion: createNativeStackScreen({
685709
screen: PullRequestDiscussionScreen,
686710
options: DETAIL_HEADER_OPTIONS,
@@ -707,7 +731,7 @@ const RootStackConfig = createWorkspaceStackNavigator({
707731
Thread: createNativeStackScreen({
708732
screen: ThreadRouteScreen,
709733
linking: { path: "threads/:environmentId?/:threadId?", alias: ["new/draft"] },
710-
options: DETAIL_HEADER_OPTIONS,
734+
options: THREAD_HEADER_OPTIONS,
711735
}),
712736
NewTaskProject: createNativeStackScreen({
713737
screen: NewTaskRouteScreen,

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ import { Atom } from "effect/reactivity";
1414
import { projectFaviconUrlAtom } from "../state/assets";
1515
import {
1616
countGlyphs,
17+
projectAutoMonogram,
1718
projectIconColorClassNames,
1819
resolveProjectIconGlyph,
1920
type ProjectIconGlyph,
@@ -167,6 +168,7 @@ function ProjectFaviconImage(props: {
167168

168169
const requestIsActive = faviconRequest !== null && activeFaviconRequest === faviconRequest;
169170
const showImage = requestIsActive && status === "loaded";
171+
const fallbackGlyph = showImage ? null : projectAutoMonogram(props.projectTitle);
170172

171173
return (
172174
<View
@@ -177,14 +179,16 @@ function ProjectFaviconImage(props: {
177179
justifyContent: "center",
178180
}}
179181
>
180-
{!showImage ? (
182+
{showImage ? null : fallbackGlyph ? (
183+
<ProjectIconGlyphView glyph={fallbackGlyph} size={props.size} />
184+
) : (
181185
<SymbolView
182186
name={{ ios: "folder.fill", android: props.open ? "folder_open" : "folder" }}
183187
size={props.size}
184188
tintColorClassName={"accent-icon-subtle"}
185189
type="monochrome"
186190
/>
187-
) : null}
191+
)}
188192

189193
{requestIsActive ? (
190194
<Image

‎apps/mobile/src/components/ui/AppSymbol.tsx‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ import IconChevronLeft from "@tabler/icons-react-native/IconChevronLeft";
3939
import IconChevronRight from "@tabler/icons-react-native/IconChevronRight";
4040
import IconChevronUp from "@tabler/icons-react-native/IconChevronUp";
4141
import IconCircle from "@tabler/icons-react-native/IconCircle";
42+
import IconCircleFilled from "@tabler/icons-react-native/IconCircleFilled";
4243
import IconCircleCheck from "@tabler/icons-react-native/IconCircleCheck";
4344
import IconCircleDashed from "@tabler/icons-react-native/IconCircleDashed";
4445
import IconCircleDot from "@tabler/icons-react-native/IconCircleDot";
@@ -176,6 +177,7 @@ const ANDROID_ICON_BY_SF_SYMBOL = {
176177
"checkmark.circle": IconCircleCheck,
177178
"checkmark.circle.fill": IconCircleCheck,
178179
circle: IconCircle,
180+
"circle.fill": IconCircleFilled,
179181
"circle.dashed": IconCircleDashed,
180182
"circle.inset.filled": IconCircleDot,
181183
"circle.dashed.inset.filled": IconCircleDot,

‎apps/mobile/src/components/ui/MenuPopup.android.tsx‎

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import {
88
Text,
99
} from "@expo/ui/jetpack-compose";
1010
import { defaultMinSize, padding, size, width } from "@expo/ui/jetpack-compose/modifiers";
11+
import type { MenuAction } from "@react-native-menu/menu";
1112
import { Pressable } from "react-native";
1213
import { resolveScaledTextRole } from "../../lib/appearancePreferences";
1314

@@ -21,6 +22,7 @@ import { isAppSymbolName, SymbolView, type AppSymbolName } from "./AppSymbol";
2122
// row's action itself; the row stays the accessible element.
2223
function MenuIcon(props: {
2324
readonly name: AppSymbolName;
25+
readonly color?: MenuAction["imageColor"];
2426
readonly onPress: () => void;
2527
readonly destructive?: boolean;
2628
readonly disabled?: boolean;
@@ -40,13 +42,15 @@ function MenuIcon(props: {
4042
name={props.name}
4143
size={iconSize}
4244
type="monochrome"
43-
tintColorClassName={
44-
props.disabled
45-
? "accent-icon-subtle"
46-
: props.destructive
47-
? "accent-danger-foreground"
48-
: "accent-foreground"
49-
}
45+
{...(typeof props.color === "string" && !props.disabled
46+
? { tintColor: props.color }
47+
: {
48+
tintColorClassName: props.disabled
49+
? "accent-icon-subtle"
50+
: props.destructive
51+
? "accent-danger-foreground"
52+
: "accent-foreground",
53+
})}
5054
/>
5155
</Pressable>
5256
</RNHostView>
@@ -96,6 +100,7 @@ export function MenuPopup(props: MenuPopupProps) {
96100
<DropdownMenuItem.LeadingIcon>
97101
<MenuIcon
98102
name={action.image}
103+
color={action.imageColor}
99104
onPress={() => props.onPress(action)}
100105
destructive={action.attributes?.destructive}
101106
disabled={action.attributes?.disabled}
Lines changed: 104 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,104 @@
1+
import type { ReactNode } from "react";
2+
import { Platform, Pressable, View } from "react-native";
3+
4+
import { cn } from "../../lib/cn";
5+
import { SymbolView, type AppSymbolName } from "./AppSymbol";
6+
import { AppText as Text } from "./AppText";
7+
import { NavigationRow } from "./NavigationRow";
8+
9+
/** A picker row in a grouped list; the first and last rows round the group's corners. */
10+
export function SelectionRow(props: {
11+
readonly icon?: AppSymbolName;
12+
/** Drawn where the icon goes, for marks a symbol can't express (a label's color dot). */
13+
readonly leading?: ReactNode;
14+
readonly onPress: () => void;
15+
readonly disabled?: boolean;
16+
readonly selected: boolean;
17+
/** "checkbox" when several rows can be selected at once. */
18+
readonly role?: "radio" | "checkbox";
19+
readonly isFirst?: boolean;
20+
readonly isLast?: boolean;
21+
readonly subtitle?: string;
22+
readonly title: string;
23+
}) {
24+
const role = props.role ?? "radio";
25+
const row =
26+
Platform.OS === "android" ? (
27+
<NavigationRow
28+
className="bg-grouped-card"
29+
title={props.title}
30+
subtitle={props.subtitle}
31+
leading={
32+
props.icon ? (
33+
<SymbolView name={props.icon} size={24} tintColorClassName="accent-icon-muted" />
34+
) : (
35+
props.leading
36+
)
37+
}
38+
trailing={
39+
props.selected ? (
40+
<SymbolView name="checkmark" size={20} tintColorClassName="accent-focus" />
41+
) : null
42+
}
43+
accessibilityRole={role}
44+
accessibilityState={{ checked: props.selected }}
45+
disabled={props.disabled}
46+
onPress={props.onPress}
47+
/>
48+
) : (
49+
<Pressable
50+
accessibilityLabel={[props.title, props.subtitle].filter(Boolean).join(", ")}
51+
accessibilityRole={role}
52+
accessibilityState={{ checked: props.selected }}
53+
className={cn(
54+
"min-h-14 flex-row items-center gap-3 bg-grouped-card px-4 py-3 active:bg-subtle",
55+
!props.isLast && "border-b border-border-subtle",
56+
)}
57+
disabled={props.disabled}
58+
onPress={props.onPress}
59+
style={{ opacity: props.disabled ? 0.45 : 1 }}
60+
>
61+
{props.icon ? (
62+
<SymbolView
63+
name={props.icon}
64+
size={17}
65+
tintColorClassName="accent-icon-muted"
66+
type="monochrome"
67+
/>
68+
) : (
69+
(props.leading ?? null)
70+
)}
71+
<View className="min-w-0 flex-1 gap-0.5">
72+
<Text className="text-base font-t3-medium text-foreground" numberOfLines={1}>
73+
{props.title}
74+
</Text>
75+
{props.subtitle ? (
76+
<Text className="text-xs text-foreground-muted" numberOfLines={1}>
77+
{props.subtitle}
78+
</Text>
79+
) : null}
80+
</View>
81+
{props.selected ? (
82+
<SymbolView
83+
name="checkmark"
84+
size={16}
85+
tintColorClassName="accent-icon"
86+
type="monochrome"
87+
weight="semibold"
88+
/>
89+
) : null}
90+
</Pressable>
91+
);
92+
if (!props.isFirst && !props.isLast) return row;
93+
return (
94+
<View
95+
className={cn(
96+
"overflow-hidden",
97+
props.isFirst && (Platform.OS === "android" ? "rounded-t-[28px]" : "rounded-t-2xl"),
98+
props.isLast && (Platform.OS === "android" ? "rounded-b-[28px]" : "rounded-b-2xl"),
99+
)}
100+
>
101+
{row}
102+
</View>
103+
);
104+
}

0 commit comments

Comments
 (0)