Skip to content

Commit 7e05f28

Browse files
Merge remote-tracking branch 'origin/main' into t3/legend-list-end-hold
# Conflicts: # pnpm-lock.yaml # pnpm-workspace.yaml
2 parents 838c8e8 + dc72705 commit 7e05f28

23 files changed

Lines changed: 1278 additions & 2102 deletions

‎.github/workflows/ci.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -592,7 +592,7 @@ jobs:
592592
needs: changes
593593
if: ${{ !cancelled() && needs.changes.outputs.release_smoke != 'false' }}
594594
runs-on: blacksmith-8vcpu-ubuntu-2404
595-
timeout-minutes: 10
595+
timeout-minutes: 15
596596
steps:
597597
- name: Checkout
598598
uses: actions/checkout@v6

‎apps/mobile/package.json‎

Lines changed: 44 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,11 @@
5353
},
5454
"dependencies": {
5555
"@clerk/expo": "catalog:",
56-
"@clerk/expo-native-components": "0.4.0",
56+
"@clerk/expo-native-components": "0.4.4",
5757
"@effect/atom-react": "catalog:",
5858
"@expo-google-fonts/dm-sans": "^0.4.2",
59-
"@expo/metro-runtime": "~58.0.14",
60-
"@expo/ui": "58.0.20",
59+
"@expo/metro-runtime": "~58.0.17",
60+
"@expo/ui": "58.0.27",
6161
"@legendapp/list": "catalog:",
6262
"@material/material-color-utilities": "0.3.0",
6363
"@pierre/diffs": "catalog:",
@@ -79,66 +79,66 @@
7979
"clsx": "^2.1.1",
8080
"diff": "8.0.3",
8181
"effect": "catalog:",
82-
"expo": "58.0.14",
82+
"expo": "58.0.23",
8383
"expo-application": "~58.1.2",
84-
"expo-asset": "~58.0.16",
85-
"expo-audio": "58.0.9",
86-
"expo-auth-session": "~58.0.13",
87-
"expo-blur": "58.0.4",
88-
"expo-build-properties": "~58.0.11",
89-
"expo-camera": "~58.0.10",
90-
"expo-clipboard": "~58.0.3",
91-
"expo-constants": "~58.0.12",
84+
"expo-asset": "~58.0.20",
85+
"expo-audio": "58.0.11",
86+
"expo-auth-session": "~58.0.17",
87+
"expo-blur": "58.0.5",
88+
"expo-build-properties": "~58.0.12",
89+
"expo-camera": "~58.0.14",
90+
"expo-clipboard": "~58.0.4",
91+
"expo-constants": "~58.0.15",
9292
"expo-crypto": "~58.0.7",
93-
"expo-dev-client": "~58.0.14",
93+
"expo-dev-client": "~58.0.18",
9494
"expo-device": "~58.0.5",
9595
"expo-document-picker": "~58.0.4",
96-
"expo-file-system": "~58.0.9",
97-
"expo-font": "~58.0.8",
98-
"expo-glass-effect": "58.0.4",
96+
"expo-file-system": "~58.0.13",
97+
"expo-font": "~58.0.11",
98+
"expo-glass-effect": "58.0.5",
9999
"expo-haptics": "~58.0.7",
100-
"expo-image": "~58.0.15",
101-
"expo-image-manipulator": "~58.0.14",
100+
"expo-image": "~58.0.18",
101+
"expo-image-manipulator": "~58.0.16",
102102
"expo-image-picker": "~58.0.10",
103103
"expo-keep-awake": "~58.0.3",
104-
"expo-linking": "~58.0.13",
105-
"expo-network": "~58.0.3",
106-
"expo-notifications": "~58.1.5",
107-
"expo-observe": "~58.0.15",
108-
"expo-paste-input": "^0.1.15",
104+
"expo-linking": "~58.0.16",
105+
"expo-network": "~58.0.4",
106+
"expo-notifications": "~58.1.8",
107+
"expo-observe": "~58.0.18",
108+
"expo-paste-input": "^0.2.2",
109109
"expo-quick-actions": "^6.0.2",
110110
"expo-secure-store": "~58.0.2",
111111
"expo-sensors": "~58.0.4",
112-
"expo-sharing": "58.0.19",
113-
"expo-splash-screen": "~58.0.10",
114-
"expo-sqlite": "~58.0.13",
112+
"expo-sharing": "58.0.22",
113+
"expo-splash-screen": "~58.0.13",
114+
"expo-sqlite": "~58.0.15",
115115
"expo-symbols": "~58.0.4",
116-
"expo-updates": "~58.0.17",
117-
"expo-video": "58.0.11",
118-
"expo-web-browser": "~58.0.6",
119-
"expo-widgets": "58.0.20",
116+
"expo-updates": "~58.0.21",
117+
"expo-video": "58.0.13",
118+
"expo-web-browser": "~58.0.7",
119+
"expo-widgets": "58.0.27",
120120
"pele": "catalog:",
121121
"react": "catalog:",
122122
"react-dom": "catalog:",
123-
"react-native": "0.88.0",
123+
"react-native": "0.88.1",
124124
"react-native-blob-util": "0.25.1",
125125
"react-native-enriched-markdown": "file:deps/react-native-enriched-markdown-1.2.0-t3.18-497fbe63.tgz",
126-
"react-native-gesture-handler": "~3.3.0",
126+
"react-native-gesture-handler": "~3.5.0",
127127
"react-native-image-viewing": "^0.2.2",
128-
"react-native-keyboard-controller": "1.22.8",
129-
"react-native-nitro-modules": "0.37.1",
128+
"react-native-keyboard-controller": "1.23.0",
129+
"react-native-nitro-modules": "0.37.2",
130130
"react-native-pdf-jsi": "5.0.0",
131131
"react-native-reanimated": "4.7.1",
132-
"react-native-safe-area-context": "~5.10.1",
132+
"react-native-safe-area-context": "~5.11.1",
133133
"react-native-screens": "file:deps/react-native-screens-5.0.0-t3.48.tgz",
134-
"react-native-svg": "15.16.0",
134+
"react-native-svg": "15.16.1",
135135
"react-native-webview": "14.0.1",
136-
"react-native-worklets": "0.13.0",
136+
"react-native-worklets": "0.13.1",
137137
"remark-gfm": "catalog:",
138138
"remark-parse": "catalog:",
139139
"tailwind-merge": "^3.5.0",
140140
"unified": "catalog:",
141-
"uniwind": "1.13.0"
141+
"uniwind": "1.13.2"
142142
},
143143
"devDependencies": {
144144
"@babel/core": "^7.29.7",
@@ -149,9 +149,9 @@
149149
"@types/react": "catalog:",
150150
"@types/react-dom": "catalog:",
151151
"aws4fetch": "1.0.20",
152-
"babel-preset-expo": "~58.0.17",
152+
"babel-preset-expo": "~58.0.24",
153153
"jsdom": "^30.0.1",
154-
"nitrogen": "0.37.1",
154+
"nitrogen": "0.37.2",
155155
"tailwindcss": "^4.0.0"
156156
},
157157
"enriched-markdown": {
@@ -163,7 +163,10 @@
163163
"exclude": [
164164
"react-native-keyboard-controller",
165165
"react-native-screens",
166-
"react-native-enriched-markdown"
166+
"react-native-enriched-markdown",
167+
"react-native-gesture-handler",
168+
"react-native-svg",
169+
"react-native-worklets"
167170
]
168171
},
169172
"autolinking": {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ export function NativeAppBar(props: {
2222
// instead of at zero height until Compose has measured and reported the bar.
2323
<NativeThemeHost style={{ width: "100%", height: layout.height }}>
2424
<TopAppBar
25-
applyWindowInsets={false}
25+
windowInsets={{}}
2626
// Every header shares the list toolbar's height, so titles line up across panes.
2727
modifiers={[fillMaxWidth(), height(layout.height)]}
2828
colors={{

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

Lines changed: 52 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ import {
66
RNHostView,
77
Row,
88
SplitButtonLayout,
9+
SplitButtonLeadingButton,
10+
SplitButtonTrailingButton,
911
Text,
1012
} from "@expo/ui/jetpack-compose";
1113
import {
@@ -90,54 +92,58 @@ export function SplitButton(props: SplitButtonProps) {
9092
style={{ width: "100%" }}
9193
>
9294
<SplitButtonLayout modifiers={[fillMaxWidth()]}>
93-
<SplitButtonLayout.LeadingButton
94-
enabled={enabled}
95-
onClick={props.onPress}
96-
colors={buttonColors}
97-
modifiers={[
98-
fillMaxWidth(),
99-
defaultMinSize({ minHeight: 48 }),
100-
semantics({ contentDescription: props.accessibilityLabel ?? props.label }),
101-
]}
102-
>
103-
{label}
95+
<SplitButtonLayout.LeadingButton>
96+
<SplitButtonLeadingButton
97+
enabled={enabled}
98+
onClick={props.onPress}
99+
colors={buttonColors}
100+
modifiers={[
101+
fillMaxWidth(),
102+
defaultMinSize({ minHeight: 48 }),
103+
semantics({ contentDescription: props.accessibilityLabel ?? props.label }),
104+
]}
105+
>
106+
{label}
107+
</SplitButtonLeadingButton>
104108
</SplitButtonLayout.LeadingButton>
105-
<SplitButtonLayout.TrailingButton
106-
checked={expanded}
107-
onCheckedChange={setExpanded}
108-
enabled={menuEnabled}
109-
colors={trailingColors}
110-
modifiers={[
111-
defaultMinSize({ minWidth: 48, minHeight: 48 }),
112-
semantics({ contentDescription: props.menuTitle }),
113-
]}
114-
>
115-
<DropdownMenu
116-
expanded={expanded && menuEnabled}
117-
onDismissRequest={() => setExpanded(false)}
118-
color={colors["--color-card-alt"]}
109+
<SplitButtonLayout.TrailingButton>
110+
<SplitButtonTrailingButton
111+
checked={expanded}
112+
onCheckedChange={setExpanded}
113+
enabled={menuEnabled}
114+
colors={trailingColors}
115+
modifiers={[
116+
defaultMinSize({ minWidth: 48, minHeight: 48 }),
117+
semantics({ contentDescription: props.menuTitle }),
118+
]}
119119
>
120-
<DropdownMenu.Trigger>
121-
<Icon
122-
source={require("../../../assets/icons/chevron-down.xml")}
123-
size={iconSize}
124-
modifiers={[rotate(expanded ? 180 : 0)]}
125-
/>
126-
</DropdownMenu.Trigger>
127-
<DropdownMenu.Items>
128-
<MenuPopupItems
129-
menuWidth={menuWidth}
130-
actions={props.actions}
131-
title={props.menuTitle}
132-
parent={null}
133-
onPress={(action) => {
134-
setExpanded(false);
135-
if (action.id !== undefined) props.onPressAction(action.id);
136-
}}
137-
onBack={() => {}}
138-
/>
139-
</DropdownMenu.Items>
140-
</DropdownMenu>
120+
<DropdownMenu
121+
expanded={expanded && menuEnabled}
122+
onDismissRequest={() => setExpanded(false)}
123+
color={colors["--color-card-alt"]}
124+
>
125+
<DropdownMenu.Trigger>
126+
<Icon
127+
source={require("../../../assets/icons/chevron-down.xml")}
128+
size={iconSize}
129+
modifiers={[rotate(expanded ? 180 : 0)]}
130+
/>
131+
</DropdownMenu.Trigger>
132+
<DropdownMenu.Items>
133+
<MenuPopupItems
134+
menuWidth={menuWidth}
135+
actions={props.actions}
136+
title={props.menuTitle}
137+
parent={null}
138+
onPress={(action) => {
139+
setExpanded(false);
140+
if (action.id !== undefined) props.onPressAction(action.id);
141+
}}
142+
onBack={() => {}}
143+
/>
144+
</DropdownMenu.Items>
145+
</DropdownMenu>
146+
</SplitButtonTrailingButton>
141147
</SplitButtonLayout.TrailingButton>
142148
</SplitButtonLayout>
143149
</NativeThemeHost>

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,10 @@ function SnoozeDateTimePicker(props: {
294294
is24Hour={props.is24Hour}
295295
showVariantToggle={false}
296296
elementColors={props.colors}
297-
onDateSelected={props.onChange}
297+
// Null marks incomplete input; keep the last valid date.
298+
onDateSelected={(date) => {
299+
if (date) props.onChange(date);
300+
}}
298301
/>
299302
);
300303
}

0 commit comments

Comments
 (0)