Skip to content

Commit 0fe3831

Browse files
authored
Merge branch 'main' into perf/mobile-file-tree-flatten
2 parents 3d62078 + 952921f commit 0fe3831

34 files changed

Lines changed: 374 additions & 230 deletions

‎.github/workflows/desktop-macos-preview.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,10 @@ jobs:
7878
- name: Install browser secret helper build libraries
7979
run: sudo apt-get update && sudo apt-get install -y libsecret-1-dev pkg-config
8080

81+
# desktop-macos-preview-publish.yml packages this bundle as the preview channel.
8182
- name: Build JS bundle
83+
env:
84+
T3CODE_TELEMETRY_CHANNEL: ${{ github.repository == 'pingdotgg/t3code' && 'preview' || 'dev' }}
8285
run: vp run build:desktop
8386

8487
# Same layout as release.yml's js-bundle so release-desktop.yml can

‎.github/workflows/release-desktop.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -501,6 +501,9 @@ jobs:
501501
# the runner, and only exact versions have a dist directory. Keep in
502502
# step with SEA_NODE_VERSION in apps/server/vite.config.ts.
503503
VP_NODE_VERSION: "26.8.2"
504+
# The executable bundles the server again, so it needs the same stamp
505+
# as release.yml's JS bundle.
506+
T3CODE_TELEMETRY_CHANNEL: ${{ github.repository == 'pingdotgg/t3code' && inputs.release_channel || 'dev' }}
504507
run: node apps/server/scripts/cli.ts build-exe --verbose
505508

506509
- name: Import macOS signing certificate for the CLI archive

‎.github/workflows/release.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -525,7 +525,11 @@ jobs:
525525
# Runs t3#build (which depends on @t3tools/web#build) and
526526
# @t3tools/desktop#build, so apps/server/dist holds the server bundle
527527
# plus the web client and apps/desktop/dist-electron the Electron main.
528+
# The release channel is already stable, nightly, or preview. Builds in
529+
# other repositories report "dev" telemetry.
528530
- name: Build JS bundle
531+
env:
532+
T3CODE_TELEMETRY_CHANNEL: ${{ github.repository == 'pingdotgg/t3code' && needs.preflight.outputs.release_channel || 'dev' }}
529533
run: vp run build:desktop
530534

531535
# Two paths under apps/ so the artifact root is apps/; consumers download

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

Lines changed: 21 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,18 @@
1-
import { Button, HStack, Picker, Popover, Text, VStack } from "@expo/ui/swift-ui";
1+
import { Button, HStack, Picker, Popover, Spacer, Text, VStack } from "@expo/ui/swift-ui";
22
import {
33
accessibilityLabel,
4+
buttonBorderShape,
45
buttonStyle,
56
disabled,
67
font,
78
foregroundStyle,
89
frame,
10+
labelStyle,
911
padding,
1012
pickerStyle,
1113
presentationBackground,
1214
tag,
15+
tint,
1316
} from "@expo/ui/swift-ui/modifiers";
1417
import { useState } from "react";
1518

@@ -71,19 +74,33 @@ export function NumberField(props: NumberFieldProps) {
7174
</Text>
7275
))}
7376
</Picker>
74-
<HStack spacing={24}>
77+
<HStack>
7578
<Button
7679
label="Cancel"
80+
systemImage="xmark"
7781
onPress={() => setOpen(false)}
78-
modifiers={[foregroundStyle(colors["--color-primary-text"])]}
82+
modifiers={[
83+
labelStyle("iconOnly"),
84+
buttonStyle("bordered"),
85+
buttonBorderShape("circle"),
86+
tint(colors["--color-foreground"]),
87+
]}
7988
/>
89+
<Spacer />
8090
<Button
8191
label="Done"
92+
systemImage="checkmark"
8293
onPress={() => {
8394
setOpen(false);
8495
if (!props.disabled && draft !== props.value) props.onValueChange(draft);
8596
}}
86-
modifiers={[foregroundStyle(colors["--color-primary-text"])]}
97+
modifiers={[
98+
labelStyle("iconOnly"),
99+
buttonStyle("borderedProminent"),
100+
buttonBorderShape("circle"),
101+
tint(colors["--color-prominent-action"]),
102+
foregroundStyle(colors["--color-prominent-action-foreground"]),
103+
]}
87104
/>
88105
</HStack>
89106
</VStack>

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,10 +51,9 @@ export function Sheet(props: SheetProps) {
5151
headerRightBarButtonItems={[
5252
{
5353
type: "button",
54-
title: "Done",
55-
variant: "done",
54+
icon: { name: "xmark", type: "sfSymbol" },
5655
accessibilityLabel: `Close ${props.title}`,
57-
identifier: `app-sheet-done-${screenId}`,
56+
identifier: `app-sheet-close-${screenId}`,
5857
onPress: close,
5958
},
6059
]}

‎apps/mobile/src/features/threads/CustomSnoozeSheet.ios.tsx‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,13 @@ function SnoozePopoverNavigation(props: {
257257
/>
258258
</Toolbar>
259259
<Toolbar placement="right">
260-
<Toolbar.Button label="Snooze" onPress={props.onSubmit} />
260+
<Toolbar.Button
261+
accessibilityLabel="Snooze"
262+
icon="checkmark"
263+
variant="prominent"
264+
tintColor={colors["--color-prominent-action"]}
265+
onPress={props.onSubmit}
266+
/>
261267
</Toolbar>
262268
<ScrollView
263269
contentInsetAdjustmentBehavior="automatic"

‎apps/mobile/src/features/threads/NewTaskDraftScreen.tsx‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1810,11 +1810,7 @@ export function NewTaskDraftScreen(props: {
18101810
}}
18111811
/>
18121812
<Toolbar placement="left">
1813-
<Toolbar.Button
1814-
accessibilityLabel="Cancel new task"
1815-
label="Cancel"
1816-
onPress={closeNewTask}
1817-
/>
1813+
<Toolbar.Button accessibilityLabel="Cancel new task" icon="xmark" onPress={closeNewTask} />
18181814
</Toolbar>
18191815

18201816
{heroViewport}

‎apps/mobile/src/features/threads/ThreadArrangementSheet.tsx‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import { useSafeAreaInsets } from "react-native-safe-area-context";
1212

1313
import { AppText as Text } from "../../components/ui/AppText";
1414
import { SymbolView } from "../../components/ui/AppSymbol";
15+
import { IconButton } from "../../components/ui/IconButton";
1516
import { scopedThreadKey } from "../../lib/scopedEntities";
1617
import { environmentServerConfigsAtom } from "../../state/server";
1718
import { environmentThreadShells } from "../../state/threads";
@@ -378,13 +379,11 @@ export function ThreadArrangementSheet(props: { onClose: () => void }) {
378379
>
379380
<View className="flex-row items-center justify-between gap-3 px-5 py-3">
380381
<Text className="flex-1 text-xl font-t3-semibold">Arrange threads</Text>
381-
<Pressable
382-
accessibilityRole="button"
382+
<IconButton
383+
accessibilityLabel="Close arrange threads"
384+
icon="xmark"
383385
onPress={props.onClose}
384-
className="min-h-11 justify-center px-3"
385-
>
386-
<Text className="text-base text-primary-text">Done</Text>
387-
</Pressable>
386+
/>
388387
</View>
389388
<Text className="px-5 pb-3 text-sm text-foreground-muted">
390389
Drag to reorder, pin, or settle. Changes save when you drop.

‎apps/mobile/src/features/threads/ThreadSettingsSheet.tsx‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1120,6 +1120,7 @@ function ThreadSettingsModelsScreen() {
11201120
const presentation = useThreadSettingsPickerPresentation();
11211121
const navigation = useNavigation<NativeStackNavigationProp<ThreadSettingsPickerStackParams>>();
11221122
const usesNativeMailSearchToolbar = useNativeMailSearchToolbar();
1123+
const theme = useUniwindTheme();
11231124
const hasCustomCatalogFilter = session.providerFilter !== null || session.showLegacy;
11241125
const commitAndClose = () => {
11251126
if (!session.commitPendingModel()) return;
@@ -1268,14 +1269,16 @@ function ThreadSettingsModelsScreen() {
12681269
<Toolbar placement="left">
12691270
<Toolbar.Button
12701271
accessibilityLabel="Cancel thread settings"
1271-
label="Cancel"
1272+
icon="xmark"
12721273
onPress={presentation.onClose}
12731274
/>
12741275
</Toolbar>
12751276
<Toolbar placement="right">
12761277
<Toolbar.Button
12771278
accessibilityLabel={session.pendingModel ? "Save thread settings" : "Done"}
1278-
label={session.pendingModel ? "Save" : "Done"}
1279+
icon="checkmark"
1280+
variant="prominent"
1281+
tintColor={theme["--color-prominent-action"]}
12791282
onPress={commitAndClose}
12801283
/>
12811284
</Toolbar>

‎apps/mobile/src/features/threads/worktree-setup-sheet.android.tsx‎

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
import { Host, ModalBottomSheet, RNHostView } from "@expo/ui/jetpack-compose";
2-
import { Pressable, View, useWindowDimensions } from "react-native";
2+
import { View, useWindowDimensions } from "react-native";
33
import { withUniwind } from "uniwind";
44
import { AndroidSheetHeader } from "../../components/ui/AndroidScreenHeader";
5-
import { AppText as Text } from "../../components/ui/AppText";
65
import type { WorktreeSetupSheetProps } from "./worktree-setup-sheet";
76

87
const NativeBottomSheet = withUniwind(ModalBottomSheet, {
@@ -27,16 +26,9 @@ export function WorktreeSetupSheet({ children, height, onClose }: WorktreeSetupS
2726
>
2827
<AndroidSheetHeader
2928
title="Worktree setup"
30-
trailing={
31-
<Pressable
32-
accessibilityRole="button"
33-
accessibilityLabel="Close setup details"
34-
onPress={onClose}
35-
className="min-h-11 justify-center px-2"
36-
>
37-
<Text className="font-t3-medium text-sm text-foreground">Done</Text>
38-
</Pressable>
39-
}
29+
actions={[
30+
{ accessibilityLabel: "Close setup details", icon: "xmark", onPress: onClose },
31+
]}
4032
/>
4133
{children}
4234
</View>

0 commit comments

Comments
 (0)