@devries-cameron20 / t3code Mirror · read-only / commits / 940e3fafd2
Fork 0

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 22, 18:15 UTC

fix(mobile): stabilize Duo search and portrait navigation (#24206)

Co-authored-by: Julius Marminge <julius0216@outlook.com> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>

Alex committed Oct 23, 2026 at 22:19 UTC 940e3fafd28ab98545b069ccfbeaf9e9da3b8f28
22 files changed +317 -192
apps/mobile/deps/react-native-screens-5.0.0-t3.37.tgz
Binary files a/apps/mobile/deps/react-native-screens-5.0.0-t3.37.tgz and /dev/null differ
apps/mobile/deps/react-native-screens-5.0.0-t3.43.tgz
Binary files /dev/null and b/apps/mobile/deps/react-native-screens-5.0.0-t3.43.tgz differ
apps/mobile/package.json
+1 -1
@@ -134,7 +134,7 @@
134 "react-native-pdf-jsi": "5.0.0",
135 "react-native-reanimated": "4.7.1",
136 "react-native-safe-area-context": "~5.10.1",
137 - "react-native-screens": "file:deps/react-native-screens-5.0.0-t3.37.tgz",
137 + "react-native-screens": "file:deps/react-native-screens-5.0.0-t3.43.tgz",
138 "react-native-shiki-engine": "^0.3.12",
139 "react-native-svg": "15.16.0",
140 "react-native-webview": "14.0.1",
apps/mobile/src/features/home/home-thread-navigation.ts
+9 -1
@@ -8,6 +8,7 @@ import {
8 import type { NativeStackNavigationProp } from "@react-navigation/native-stack";
9 import { useCallback, useEffect, useRef } from "react";
10 import { Platform } from "react-native";
11 +import { useAdaptiveWorkspaceLayout } from "../layout/adaptive-workspace-context";
12 import { useAndroidWorkspaceSelection } from "../workspace/useAndroidWorkspaceSelection";
13
14 type ThreadSelection = Pick<EnvironmentThreadShell, "environmentId" | "id">;
@@ -53,6 +54,7 @@ export function useHomeThreadRouteSelection() {
54 const navigation =
55 useNavigation<NativeStackNavigationProp<ReactNavigation.RootParamList, "Home">>();
56 const dismissingRouteKey = useRef<string | null>(null);
57 + const { layout, setPrimarySidebarVisible } = useAdaptiveWorkspaceLayout();
58 const selectAndroidWorkspace = useAndroidWorkspaceSelection();
59
60 useEffect(() => {
@@ -85,6 +87,7 @@ export function useHomeThreadRouteSelection() {
87 });
88 return;
89 }
90 + if (layout.primarySidebarOverlaysContent) setPrimarySidebarVisible(false);
91 navigation.dispatch((state) =>
92 createHomeThreadRouteAction({
93 state,
@@ -93,7 +96,12 @@ export function useHomeThreadRouteSelection() {
96 }),
97 );
98 },
96 - [navigation, selectAndroidWorkspace],
99 + [
100 + layout.primarySidebarOverlaysContent,
101 + navigation,
102 + selectAndroidWorkspace,
103 + setPrimarySidebarVisible,
104 + ],
105 );
106 }
107
apps/mobile/src/features/layout/AdaptiveWorkspaceLayout.tsx
+30 -4
@@ -233,6 +233,24 @@ function AdaptiveWorkspaceLayoutContent(
233 () => deriveLayout({ width: viewportWidth, height, nativeMetrics, nativeWorkspace }),
234 [height, viewportWidth, nativeMetrics, nativeWorkspace],
235 );
236 + const [overlaySidebar, setOverlaySidebar] = useState({
237 + active: baseLayout.primarySidebarOverlaysContent,
238 + pathname,
239 + visible: pathname === "/",
240 + });
241 + if (
242 + overlaySidebar.active !== baseLayout.primarySidebarOverlaysContent ||
243 + (overlaySidebar.active && overlaySidebar.pathname !== pathname)
244 + ) {
245 + setOverlaySidebar({
246 + active: baseLayout.primarySidebarOverlaysContent,
247 + pathname,
248 + visible: pathname === "/",
249 + });
250 + }
251 + const preferredSidebarVisible = baseLayout.primarySidebarOverlaysContent
252 + ? overlaySidebar.visible
253 + : primarySidebarPreferredVisible;
254 const primarySidebarPinned = isPrimarySidebarPinned({
255 pathname,
256 nativeWorkspace,
@@ -250,7 +268,7 @@ function AdaptiveWorkspaceLayoutContent(
268 );
269 const showPrimarySidebar =
270 !workspacePage &&
253 - (primarySidebarPinned || (primarySidebarPreferredVisible && !composerKeyboardActive));
271 + (primarySidebarPinned || (preferredSidebarVisible && !composerKeyboardActive));
272 const shouldRenderNavigationRail = Platform.OS === "android" && baseLayout.usesSplitView;
273 const navigationRailWidth =
274 shouldRenderNavigationRail && (showPrimarySidebar || workspacePage)
@@ -282,7 +300,7 @@ function AdaptiveWorkspaceLayoutContent(
300 viewportWidth: width,
301 preferredWidth: fileInspectorPreferredWidth ?? undefined,
302 reservedLeadingWidth:
285 - shouldRenderPrimarySidebar && showPrimarySidebar
303 + shouldRenderPrimarySidebar && showPrimarySidebar && !layout.primarySidebarOverlaysContent
304 ? (layout.listPaneWidth ?? 0) + (layout.listPaneGap ?? 0)
305 : 0,
306 }),
@@ -366,6 +384,13 @@ function AdaptiveWorkspaceLayoutContent(
384 setFocusedAuxiliaryPaneRole(null);
385 };
386 };
387 + const setPrimarySidebarVisible = (visible: boolean) => {
388 + if (layout.primarySidebarOverlaysContent) {
389 + setOverlaySidebar((current) => ({ ...current, visible }));
390 + } else {
391 + setPrimarySidebarPreferredVisible(visible);
392 + }
393 + };
394 const togglePrimarySidebar = () => {
395 if (primarySidebarPinned) {
396 return;
@@ -381,14 +406,14 @@ function AdaptiveWorkspaceLayoutContent(
406 setPrimarySidebarPreferredVisible(true);
407 return;
408 }
384 - setPrimarySidebarPreferredVisible((current) => !current);
409 + setPrimarySidebarVisible(!preferredSidebarVisible);
410 };
411 const revealPrimarySidebar = () => {
412 if (composerKeyboardActive) void KeyboardController.dismiss();
413 if (panes.primarySidebarSuppressedByAuxiliary) {
414 setFileInspectorPreferredVisible(false);
415 }
391 - setPrimarySidebarPreferredVisible(true);
416 + setPrimarySidebarVisible(true);
417 };
418 const handleToggleSidebarCommand = () => {
419 togglePrimarySidebar();
@@ -745,6 +770,7 @@ function AdaptiveWorkspaceLayoutContent(
770 showAuxiliaryPane,
771 toggleAuxiliaryPane,
772 togglePrimarySidebar,
773 + setPrimarySidebarVisible,
774 setAuxiliaryPaneWidth,
775 composerKeyboardActive,
776 setComposerEditing,
apps/mobile/src/features/layout/adaptive-workspace-context.ts
+2
@@ -25,6 +25,7 @@ interface AdaptiveWorkspaceContextValue {
25 readonly showAuxiliaryPane: (role: WorkspaceAuxiliaryPaneRole) => void;
26 readonly toggleAuxiliaryPane: () => void;
27 readonly togglePrimarySidebar: () => void;
28 + readonly setPrimarySidebarVisible: (visible: boolean) => void;
29 readonly setAuxiliaryPaneWidth: (width: number) => void;
30 /**
31 * Android split view while the thread composer has the soft keyboard: the
@@ -61,6 +62,7 @@ export const AdaptiveWorkspaceContext = createContext<AdaptiveWorkspaceContextVa
62 showAuxiliaryPane: () => undefined,
63 toggleAuxiliaryPane: () => undefined,
64 togglePrimarySidebar: () => undefined,
65 + setPrimarySidebarVisible: () => undefined,
66 setAuxiliaryPaneWidth: () => undefined,
67 composerKeyboardActive: false,
68 setComposerEditing: () => undefined,
apps/mobile/src/features/layout/createWorkspaceStackNavigator.ios.tsx
+23 -6
@@ -78,15 +78,17 @@ function ColumnScreen(props: {
78 readonly navigation: ViewProps["navigation"];
79 }) {
80 const { descriptor } = props;
81 + const [presented, setPresented] = useState(false);
82 const primaryColumn = useMemo(
83 () =>
84 props.primary
85 ? {
86 + presented,
87 selectedThreadKey: props.selectedThreadKey ?? null,
88 selectedPullRequestKey: props.selectedPullRequestKey ?? null,
89 }
90 : null,
89 - [props.primary, props.selectedThreadKey, props.selectedPullRequestKey],
91 + [props.primary, props.selectedThreadKey, props.selectedPullRequestKey, presented],
92 );
93 const key = descriptor.route.key;
94 return (
@@ -101,10 +103,12 @@ function ColumnScreen(props: {
103 props.navigation.emit({ type: "transitionStart", target: key, data: { closing: false } });
104 }}
105 onDidAppear={() => {
106 + setPresented(true);
107 props.onAppearance("didAppear", key);
108 props.navigation.emit({ type: "transitionEnd", target: key, data: { closing: false } });
109 }}
110 onWillDisappear={() => {
111 + setPresented(false);
112 props.onAppearance("willDisappear", key);
113 props.navigation.emit({ type: "transitionStart", target: key, data: { closing: true } });
114 }}
@@ -145,8 +149,14 @@ function ColumnScreen(props: {
149 function WorkspaceColumns(
150 props: ViewProps & { readonly primary: Route; readonly detail: Route[] },
151 ) {
148 - const { layout, panes, togglePrimarySidebar, toggleAuxiliaryPane, startNewTask } =
149 - useAdaptiveWorkspaceLayout();
152 + const {
153 + layout,
154 + panes,
155 + togglePrimarySidebar,
156 + setPrimarySidebarVisible,
157 + toggleAuxiliaryPane,
158 + startNewTask,
159 + } = useAdaptiveWorkspaceLayout();
160 const deviceType = useDeviceType();
161 // Split screens must remain mounted while UIKit animates a detached route away.
162 const [screens, setScreens] = useState({
@@ -179,7 +189,7 @@ function WorkspaceColumns(
189 const selectedTab = useWorkspaceTabs()?.state.selectedTab;
190 const openNewTask = startNewTask;
191 // The cover detail rail needs room for thread tools above the fixed tabs.
182 - // The unfolded Duo keeps compose beside its sidebar control.
192 + // The unfolded Duo keeps compose in its detail bar.
193 const detailCompose =
194 deviceType === "duo-unfolded" && selectedTab !== "pullRequests" ? openNewTask : undefined;
195 const inspector = use(NativeWorkspaceInspectorContext);
@@ -255,7 +265,7 @@ function WorkspaceColumns(
265 <Split.Host
266 ref={hostRef}
267 testID="adaptive-workspace-layout"
258 - preferredSplitBehavior="tile"
268 + preferredSplitBehavior={layout.primarySidebarOverlaysContent ? "overlay" : "tile"}
269 primaryBackgroundStyle={deviceType === "pad" ? "none" : "default"}
270 topColumnForCollapsing={compactColumn}
271 onCollapse={() => {
@@ -270,9 +280,16 @@ function WorkspaceColumns(
280 // collapsed split already carries the sidebar the expanded one will show.
281 (layout.usesSplitView ? panes.primarySidebarVisible : panes.primarySidebarWhenExpanded) ||
282 (!layout.usesSplitView && !activeDetailKey)
273 - ? "oneBesideSecondary"
283 + ? layout.primarySidebarOverlaysContent
284 + ? "oneOverSecondary"
285 + : "oneBesideSecondary"
286 : "secondaryOnly"
287 }
288 + onDisplayModeWillChange={({ nativeEvent }) => {
289 + if (!layout.primarySidebarOverlaysContent) return;
290 + if (nativeEvent.nextDisplayMode === "oneOverSecondary") setPrimarySidebarVisible(true);
291 + else if (nativeEvent.nextDisplayMode === "secondaryOnly") setPrimarySidebarVisible(false);
292 + }}
293 displayModeButtonVisibility="never"
294 presentsWithGesture
295 showInspector={inspector.visible}
apps/mobile/src/features/layout/useWorkspaceSidebarHeaderItem.ts
+19 -7
@@ -5,23 +5,35 @@ import { withNativeGlassHeaderItem } from "./native-glass-header-items";
5
6 export function useWorkspaceSidebarHeaderItem() {
7 const usesNativeWorkspaceColumns = useNativeWorkspaceColumnsSupported();
8 - const { panes, togglePrimarySidebar } = useAdaptiveWorkspaceLayout();
8 + const { layout, panes, togglePrimarySidebar } = useAdaptiveWorkspaceLayout();
9 + const label = panes.primarySidebarVisible
10 + ? layout.primarySidebarOverlaysContent
11 + ? "Hide thread sidebar"
12 + : "Maximize content"
13 + : "Show thread sidebar";
14 return useMemo(
15 () =>
16 withNativeGlassHeaderItem({
17 axisBehavior: usesNativeWorkspaceColumns ? "horizontalOnly" : undefined,
13 - accessibilityLabel: panes.primarySidebarVisible
14 - ? "Maximize content"
15 - : "Show thread sidebar",
18 + accessibilityLabel: label,
19 icon: {
17 - name: panes.primarySidebarVisible ? "arrow.up.left.and.arrow.down.right" : "sidebar.left",
20 + name:
21 + panes.primarySidebarVisible && !layout.primarySidebarOverlaysContent
22 + ? "arrow.up.left.and.arrow.down.right"
23 + : "sidebar.left",
24 type: "sfSymbol" as const,
25 },
26 identifier: "thread-left-sidebar",
21 - label: panes.primarySidebarVisible ? "Maximize content" : "Show thread sidebar",
27 + label,
28 onPress: togglePrimarySidebar,
29 type: "button" as const,
30 }),
25 - [panes.primarySidebarVisible, togglePrimarySidebar, usesNativeWorkspaceColumns],
31 + [
32 + label,
33 + layout.primarySidebarOverlaysContent,
34 + panes.primarySidebarVisible,
35 + togglePrimarySidebar,
36 + usesNativeWorkspaceColumns,
37 + ],
38 );
39 }
apps/mobile/src/features/pull-requests/PullRequestRouteScreen.tsx
+4
@@ -63,6 +63,7 @@ import { AndroidScreenHeader } from "../../components/ui/AndroidScreenHeader";
63 import { useAndroidControlSizing } from "../../components/ui/useAndroidControlSizing";
64 import { useAdaptiveWorkspaceLayout } from "../layout/AdaptiveWorkspaceLayout";
65 import { AndroidWorkspaceSidebarButton } from "../layout/workspace-sidebar-toolbar";
66 +import { useWorkspaceSidebarHeaderItem } from "../layout/useWorkspaceSidebarHeaderItem";
67 import { useAndroidWorkspaceBack } from "../workspace/useAndroidWorkspaceNavigation";
68 import { EmptyState } from "../../components/ui/EmptyState";
69 import { SegmentedControl } from "../../components/ui/SegmentedControl";
@@ -273,6 +274,7 @@ function usePullRequestToolbarHeight(bottomInset: number) {
274 export function PullRequestRouteScreen({ route }: StaticScreenProps<PullRequestParams>) {
275 const returnToList = useAndroidWorkspaceBack("pullRequests");
276 const { layout } = useAdaptiveWorkspaceLayout();
277 + const sidebarHeaderItem = useWorkspaceSidebarHeaderItem();
278 const navigation = useNavigation();
279 const insets = useSafeAreaInsets();
280 const [toolbarHeight, setToolbarHeight] = usePullRequestToolbarHeight(insets.bottom);
@@ -397,7 +399,9 @@ export function PullRequestRouteScreen({ route }: StaticScreenProps<PullRequestP
399 unstable_headerSubtitle: connected
400 ? params.repository
401 : `${params.repository} · Offline`,
402 + unstable_headerLeftItems: layout.usesSplitView ? () => [sidebarHeaderItem] : undefined,
403 }}
404 + optionsVersion={[layout.usesSplitView, sidebarHeaderItem]}
405 />
406 {Platform.OS === "android" ? (
407 <AndroidScreenHeader
apps/mobile/src/features/threads/ThreadDetailScreen.tsx
+25 -5
@@ -1,4 +1,5 @@
1 import { useSidebarWorkspaceTabs } from "../workspace/useSystemWorkspaceTabBar";
2 +import { useWorkspaceTabs } from "../workspace/WorkspaceTabsContext";
3 import {
4 isAtomCommandInterrupted,
5 settlePromise,
@@ -106,6 +107,7 @@ import { useSafeAreaInsets } from "react-native-safe-area-context";
107 import { useWorkspaceContentWidth } from "../layout/workspace-content-width";
108 import { useNativeWorkspaceColumnsSupported } from "../../native/NativeWorkspaceColumns";
109 import {
110 + useDeviceType,
111 useDuoBottomBarInset,
112 useNativeColumnLayoutMetrics,
113 useNativeLayoutMetrics,
@@ -455,6 +457,15 @@ function ThreadVisitWatermark(props: {
457
458 export const ThreadDetailScreen = function ThreadDetailScreen(props: ThreadDetailScreenProps) {
459 const usesNativeWorkspaceColumns = useNativeWorkspaceColumnsSupported();
460 + const deviceType = useDeviceType();
461 + const workspace = useWorkspaceTabs();
462 + const sidebarSearchActive =
463 + deviceType === "duo-unfolded" &&
464 + workspace?.state.tabs[workspace.state.selectedTab].searchMode === "active";
465 + // Keep the last input owner through keyboard dismissal, so closing sidebar
466 + // search cannot briefly lift the composer into the keyboard's closing frame.
467 + const [composerOwnsKeyboard, setComposerOwnsKeyboard] = useState(false);
468 + if (sidebarSearchActive && composerOwnsKeyboard) setComposerOwnsKeyboard(false);
469 const navigation = useNavigation();
470 const { session: voiceInputSession } = useGlobalVoiceInput();
471 const reportedModelSelection = useThreadReportedModelSelection(props.selectedThreadDetailRef);
@@ -514,6 +525,8 @@ export const ThreadDetailScreen = function ThreadDetailScreen(props: ThreadDetai
525 const handleOwnedInputFocusChange = (focused: boolean) => {
526 ownedInputFocusedRef.current = focused;
527 if (focused) {
528 + if (deviceType === "duo-folded" || deviceType === "duo-unfolded")
529 + setComposerOwnsKeyboard(true);
530 setKeyboardStateSuspect(false);
531 }
532 };
@@ -566,10 +579,13 @@ export const ThreadDetailScreen = function ThreadDetailScreen(props: ThreadDetai
579 (Platform.OS === "ios" && Platform.isPad
580 ? Math.max(bottomSafeArea, 12) - (hasSidebarTabBar ? 5 : 0)
581 : undefined);
569 - const composerBottomInset =
570 - alignedBottomInset !== undefined
571 - ? Math.max(0, alignedBottomInset - THREAD_COMPOSER_BOTTOM_GUTTER)
572 - : Math.max(bottomSafeArea, 12);
582 + // The Duo's floating sidebar pill ends three points below the composer's usual gutter.
583 + const composerBottomInset = Math.max(
584 + 0,
585 + (alignedBottomInset !== undefined
586 + ? alignedBottomInset - THREAD_COMPOSER_BOTTOM_GUTTER
587 + : Math.max(bottomSafeArea, 12)) - (hasSidebarTabBar ? 3 : 0),
588 + );
589 const composerKeyboardOffset = composerBottomInset;
590 const contentPresentationKind = props.contentPresentation.kind;
591 const realThreadSyncLabel = (() => {
@@ -1441,7 +1457,11 @@ export const ThreadDetailScreen = function ThreadDetailScreen(props: ThreadDetai
1457 {showContent ? (
1458 <KeyboardStickyView
1459 // Waiting for a visibility render misses the first keyboard frames.
1444 - enabled={Platform.OS === "ios" || !keyboardStateSuspect}
1460 + enabled={
1461 + Platform.OS === "ios"
1462 + ? deviceType !== "duo-unfolded" || (composerOwnsKeyboard && !sidebarSearchActive)
1463 + : !keyboardStateSuspect
1464 + }
1465 pointerEvents="box-none"
1466 style={{ position: "absolute", bottom: 0, left: 0, right: 0, top: 0 }}
1467 offset={{ closed: 0, opened: composerKeyboardOffset }}
apps/mobile/src/features/workspace/WorkspaceNativeTabs.ios.tsx
+6 -1
@@ -17,6 +17,7 @@ import { WorkspaceTabsContext, useWorkspaceTabs } from "./WorkspaceTabsContext";
17 import {
18 NATIVE_WORKSPACE_TAB_SLOTS,
19 workspaceTabForNativeSlot,
20 + workspaceUsesColumns,
21 type WorkspaceTab,
22 } from "./workspace-tabs-state";
23 import { NativeWorkspaceTabActivityContext } from "../../native/v5-workspace-context";
@@ -162,7 +163,11 @@ export function WorkspaceNativeTabs(props: {
163 );
164 })}
165 </Tabs.Host>
165 - {(deviceType === "pad" || compactTabs) && !props.hidden ? (
166 + {(deviceType === "pad" ||
167 + compactTabs ||
168 + (layout.primarySidebarOverlaysContent &&
169 + (workspace.settingsOpen || !workspaceUsesColumns(selectedTab)))) &&
170 + !props.hidden ? (
171 <View
172 pointerEvents="box-none"
173 style={{
apps/mobile/src/features/workspace/WorkspaceRootScreen.tsx
+20 -18
@@ -110,24 +110,26 @@ function WorkspaceRootContent() {
110 );
111 const tab = state.tabs[state.selectedTab];
112 const bottomClearance =
113 - Platform.OS === "ios" && isDuoDevice(deviceType)
114 - ? workspaceSearchBottomClearance({
115 - bottomInset: insets.bottom,
116 - bottomBarInset,
117 - keyboardHeight,
118 - })
119 - : compactTabs || deviceType === "pad"
120 - ? workspaceDockBottomClearance({ bottomInset: insets.bottom, keyboardHeight })
121 - : Platform.OS === "ios"
122 - ? Math.max(insets.bottom, keyboardHeight) +
123 - (systemTabBar || sidebarTabs || tab.searchMode !== "resting"
124 - ? sidebarPicker
125 - ? 80
126 - : 16
127 - : WORKSPACE_DOCK.height + WORKSPACE_DOCK.bottomGap + 16)
128 - : keyboardHeight > 0 && tab.searchMode !== "resting"
129 - ? keyboardHeight + 64
130 - : Math.max(insets.bottom, 12) + workspaceToolbarHeight(tab.searchMode) + 16;
113 + layout.primarySidebarOverlaysContent && state.selectedTab === "usage"
114 + ? workspaceDockBottomClearance({ bottomInset: insets.bottom, keyboardHeight })
115 + : Platform.OS === "ios" && isDuoDevice(deviceType)
116 + ? workspaceSearchBottomClearance({
117 + bottomInset: insets.bottom,
118 + bottomBarInset,
119 + keyboardHeight,
120 + })
121 + : compactTabs || deviceType === "pad"
122 + ? workspaceDockBottomClearance({ bottomInset: insets.bottom, keyboardHeight })
123 + : Platform.OS === "ios"
124 + ? Math.max(insets.bottom, keyboardHeight) +
125 + (systemTabBar || sidebarTabs || tab.searchMode !== "resting"
126 + ? sidebarPicker
127 + ? 80
128 + : 16
129 + : WORKSPACE_DOCK.height + WORKSPACE_DOCK.bottomGap + 16)
130 + : keyboardHeight > 0 && tab.searchMode !== "resting"
131 + ? keyboardHeight + 64
132 + : Math.max(insets.bottom, 12) + workspaceToolbarHeight(tab.searchMode) + 16;
133 const context = useMemo(() => ({ ...workspace, bottomClearance }), [workspace, bottomClearance]);
134
135 return (
apps/mobile/src/features/workspace/WorkspaceToolbar.ios.tsx
+83 -111
@@ -1,56 +1,24 @@
1 import { useActiveNewTask } from "../../state/active-new-task";
2 import { Toolbar } from "../../components/ui/Toolbar";
3 -import { useFocusEffect } from "@react-navigation/native";
4 -import { use, useCallback, useEffect, useRef, type ReactNode } from "react";
5 -import { Platform, Pressable, type TextInputInstance } from "react-native";
6 -import { useReanimatedKeyboardAnimation } from "react-native-keyboard-controller";
7 -import Animated, { useAnimatedStyle } from "react-native-reanimated";
8 -import { useSafeAreaInsets } from "react-native-safe-area-context";
3 +import { useFocusEffect, useIsFocused } from "@react-navigation/native";
4 +import { use, useCallback, useEffect, useRef } from "react";
5 +import { Platform } from "react-native";
6 import { isDuoDevice } from "../../lib/device-type";
10 -import { useDeviceType, useDuoBottomBarInset } from "../../native/native-layout-metrics";
7 +import { useDeviceType } from "../../native/native-layout-metrics";
8 import type { SearchBarCommands } from "react-native-screens";
9
13 -import { SymbolView } from "../../components/ui/AppSymbol";
14 -import { GlassSurface } from "../../components/ui/GlassSurface";
10 import { NATIVE_LIQUID_GLASS_SUPPORTED } from "../../native/native-glass";
11 import { NativeStackScreenOptions } from "../../native/StackHeader";
17 -import { NativeWorkspaceTabActivityContext } from "../../native/v5-workspace-context";
12 +import {
13 + NativePrimaryColumnContext,
14 + NativeWorkspaceTabActivityContext,
15 +} from "../../native/v5-workspace-context";
16 import { useHardwareKeyboardCommand } from "../keyboard/hardwareKeyboardCommands";
17 import { useAdaptiveWorkspaceLayout } from "../layout/AdaptiveWorkspaceLayout";
18 import { useWorkspaceTabs } from "./WorkspaceTabsContext";
21 -import { WorkspaceSearchField } from "./WorkspaceSearchField";
22 -import { WORKSPACE_TOOLBAR } from "./workspace-tabs-state";
19 import { useCompactWorkspaceTabs, useSidebarWorkspaceTabs } from "./useSystemWorkspaceTabBar";
20 import { WorkspaceTabToolbarButtons } from "./WorkspaceSectionToolbar";
21
26 -/**
27 - * Rises once the keyboard reaches its content. UIKit also reports keyboards without height, with a
28 - * hardware keyboard and around a fold, and those must not move it.
29 - */
30 -function AboveKeyboard(props: { readonly bottom: number; readonly children: ReactNode }) {
31 - const keyboard = useReanimatedKeyboardAnimation();
32 - const { bottom } = props;
33 - const lift = useAnimatedStyle(() => ({
34 - transform: [{ translateY: Math.min(0, keyboard.height.value + bottom - 8) }],
35 - }));
36 - return (
37 - <Animated.View
38 - pointerEvents="box-none"
39 - className="absolute inset-x-0 bottom-0 flex-row items-center"
40 - style={[
41 - {
42 - gap: WORKSPACE_TOOLBAR.gap,
43 - paddingHorizontal: WORKSPACE_TOOLBAR.edge,
44 - paddingBottom: bottom,
45 - },
46 - lift,
47 - ]}
48 - >
49 - {props.children}
50 - </Animated.View>
51 - );
52 -}
53 -
22 export function WorkspaceToolbar(props: {
23 readonly onNewTask: () => void;
24 readonly sidebar?: boolean;
@@ -60,25 +28,28 @@ export function WorkspaceToolbar(props: {
28 const deviceType = useDeviceType();
29 const sidebarTabs = useSidebarWorkspaceTabs();
30 const compactTabs = useCompactWorkspaceTabs();
31 + const duoSearch = NATIVE_LIQUID_GLASS_SUPPORTED && isDuoDevice(deviceType);
32 + const bottomSearch = duoSearch && sidebarTabs !== "picker";
33 // On the Duo, compose belongs to the threads tab, in the detail column's bar when unfolded.
34 const nativeToolbarCompose =
35 Platform.OS === "ios" &&
36 deviceType === "duo-folded" &&
37 workspace.state.selectedTab === "threads" &&
38 activeNewTask === null;
69 - // The Duo searches from a field at the bottom of the list in every pose. UIKit has no such
70 - // placement once the vertical bar holds the toolbar, and re-placing its search controller on
71 - // each fold replaces the search field.
72 - const listSearch = isDuoDevice(deviceType);
73 - const insets = useSafeAreaInsets();
74 - const bottomBarInset = useDuoBottomBarInset();
39 const { isTabActive } = workspace;
40 const tabActive = use(NativeWorkspaceTabActivityContext)?.active ?? true;
41 + const focused = useIsFocused();
42 const { panes, togglePrimarySidebar } = useAdaptiveWorkspaceLayout();
43 const searchRef = useRef<SearchBarCommands>(null);
79 - const fieldRef = useRef<TextInputInstance>(null);
44 const tab = workspace.state.tabs[workspace.state.selectedTab];
45 const selectedTab = workspace.state.selectedTab;
46 + const foldedSearch = deviceType === "duo-folded";
47 + const primaryColumn = use(NativePrimaryColumnContext);
48 + // UIKit hosts integrated search outside the sidebar's sliding content.
49 + // Mount it after native appearance so it cannot precede the pane's reveal.
50 + const searchVisible = foldedSearch
51 + ? tab.searchMode !== "resting"
52 + : deviceType !== "duo-unfolded" || primaryColumn?.presented !== false;
53 const enterSearch = useCallback(() => {
54 workspace.dispatch({
55 type: "scroll",
@@ -90,14 +61,10 @@ export function WorkspaceToolbar(props: {
61 }, [workspace, selectedTab, props.sidebar, panes.primarySidebarVisible, togglePrimarySidebar]);
62 const focusSearch = useCallback(() => {
63 if (!workspace.isTabActive(selectedTab)) return false;
93 - if (listSearch) {
94 - fieldRef.current?.focus();
95 - return true;
96 - }
97 - if (!NATIVE_LIQUID_GLASS_SUPPORTED) enterSearch();
64 + if (duoSearch || !NATIVE_LIQUID_GLASS_SUPPORTED) enterSearch();
65 searchRef.current?.focus();
66 return true;
100 - }, [workspace, selectedTab, listSearch, enterSearch]);
67 + }, [workspace, selectedTab, enterSearch, duoSearch]);
68 const cancelSearch = useCallback(() => {
69 workspace.recordScrollOffset(selectedTab, tab.searchEntryOffset);
70 workspace.dispatch({ type: "cancel", tab: selectedTab });
@@ -110,10 +77,30 @@ export function WorkspaceToolbar(props: {
77 [tab.searchMode, enterSearch, workspace, selectedTab],
78 );
79 useHardwareKeyboardCommand("focusSearch", focusSearch);
80 + // The sidebar remains visible while its detail owns navigation focus.
81 + const searchHostVisible = focused || primaryColumn?.presented === true;
82 const restoreSearch = useCallback(() => {
114 - if (isTabActive(selectedTab) && tab.searchMode !== "resting")
83 + if (
84 + searchHostVisible &&
85 + searchVisible &&
86 + isTabActive(selectedTab) &&
87 + tab.searchMode !== "resting"
88 + ) {
89 searchRef.current?.setText(tab.query);
116 - }, [isTabActive, selectedTab, tab.searchMode, tab.query]);
90 + if (duoSearch) {
91 + searchRef.current?.setActive(true);
92 + if (tab.searchMode === "active") searchRef.current?.focus();
93 + }
94 + }
95 + }, [
96 + searchHostVisible,
97 + duoSearch,
98 + isTabActive,
99 + selectedTab,
100 + tab.searchMode,
101 + tab.query,
102 + searchVisible,
103 + ]);
104 useFocusEffect(
105 useCallback(() => {
106 const frame = requestAnimationFrame(restoreSearch);
@@ -124,16 +111,39 @@ export function WorkspaceToolbar(props: {
111 if (!tabActive) return;
112 const frame = requestAnimationFrame(restoreSearch);
113 return () => cancelAnimationFrame(frame);
127 - }, [restoreSearch, tabActive]);
114 + }, [restoreSearch, tabActive, bottomSearch]);
115 + const composeButton = nativeToolbarCompose ? (
116 + <Toolbar.Button
117 + identifier="workspace-compose"
118 + accessibilityLabel="New chat"
119 + icon="square.and.pencil"
120 + onPress={props.onNewTask}
121 + separateBackground
122 + />
123 + ) : null;
124 + const searchButton = foldedSearch ? (
125 + <Toolbar.Button
126 + identifier="workspace-search"
127 + accessibilityLabel={
128 + searchVisible
129 + ? "Close search"
130 + : selectedTab === "pullRequests"
131 + ? "Search pull requests"
132 + : "Search threads"
133 + }
134 + icon={searchVisible ? "xmark" : "magnifyingglass"}
135 + onPress={searchVisible ? () => searchRef.current?.cancelSearch() : focusSearch}
136 + separateBackground
137 + />
138 + ) : null;
139 return (
140 <>
141 <NativeStackScreenOptions
142 optionsVersion={[selectedTab, tab.searchMode]}
143 + listeners={{ transitionEnd: restoreSearch }}
144 options={{
133 - // Liquid Glass keeps search mounted as UIKit's own header button, which
134 - // morphs into the field; swapping a stacked bar in and out cannot animate.
145 headerSearchBarOptions:
136 - !listSearch && (NATIVE_LIQUID_GLASS_SUPPORTED || tab.searchMode !== "resting")
146 + (NATIVE_LIQUID_GLASS_SUPPORTED || tab.searchMode !== "resting") && searchVisible
147 ? {
148 ref: searchRef,
149 autoFocus: tab.searchMode === "active",
@@ -141,11 +151,18 @@ export function WorkspaceToolbar(props: {
151 hideNavigationBar: false,
152 hideWhenScrolling: false,
153 obscureBackground: false,
144 - placement: NATIVE_LIQUID_GLASS_SUPPORTED ? "integratedButton" : "stacked",
145 - allowToolbarIntegration: NATIVE_LIQUID_GLASS_SUPPORTED,
154 + placement: NATIVE_LIQUID_GLASS_SUPPORTED
155 + ? bottomSearch
156 + ? "integrated"
157 + : "integratedButton"
158 + : "stacked",
159 + allowToolbarIntegration:
160 + NATIVE_LIQUID_GLASS_SUPPORTED &&
161 + deviceType !== "phone" &&
162 + sidebarTabs !== "picker",
163 placeholder:
164 selectedTab === "pullRequests" ? "Search pull requests" : "Search threads",
148 - cancelButtonText: "✕",
165 + cancelButtonHidden: foldedSearch,
166 onFocus: searchFocused,
167 onBlur: () => workspace.dispatch({ type: "expand", tab: selectedTab }),
168 onSearchButtonPress: () => searchRef.current?.blur(),
@@ -162,6 +179,9 @@ export function WorkspaceToolbar(props: {
179 />
180 {/* UIKit lays trailing items out from the edge inward. */}
181 <Toolbar placement="right">
182 + {searchButton}
183 + {nativeToolbarCompose && foldedSearch ? <Toolbar.Spacer width={8} /> : null}
184 + {composeButton}
185 {selectedTab !== "threads" ||
186 isDuoDevice(deviceType) ||
187 deviceType === "pad" ||
@@ -185,56 +205,8 @@ export function WorkspaceToolbar(props: {
205 </Toolbar>
206 <Toolbar placement="bottom">
207 {sidebarTabs === "toolbar" ? <WorkspaceTabToolbarButtons /> : null}
188 - {nativeToolbarCompose ? <Toolbar.Spacer flexible /> : null}
189 - {nativeToolbarCompose ? (
190 - <Toolbar.Button
191 - identifier="workspace-compose"
192 - accessibilityLabel="New chat"
193 - icon="square.and.pencil"
194 - onPress={props.onNewTask}
195 - separateBackground
196 - />
197 - ) : null}
208 + {bottomSearch && searchVisible ? <Toolbar.SearchBarSlot /> : null}
209 </Toolbar>
199 - {listSearch ? (
200 - <AboveKeyboard bottom={bottomBarInset ?? Math.max(insets.bottom, 12)}>
201 - <WorkspaceSearchField
202 - ref={fieldRef}
203 - tab={selectedTab}
204 - query={tab.query}
205 - onChangeQuery={(query) =>
206 - workspace.dispatch({ type: "query", query, tab: selectedTab })
207 - }
208 - onFocus={searchFocused}
209 - onBlur={() => workspace.dispatch({ type: "expand", tab: selectedTab })}
210 - onClear={() => {
211 - workspace.dispatch({ type: "query", query: "", tab: selectedTab });
212 - fieldRef.current?.focus();
213 - }}
214 - />
215 - {tab.searchMode === "resting" ? null : (
216 - <GlassSurface
217 - style={{
218 - width: WORKSPACE_TOOLBAR.height,
219 - height: WORKSPACE_TOOLBAR.height,
220 - borderRadius: WORKSPACE_TOOLBAR.height / 2,
221 - }}
222 - >
223 - <Pressable
224 - accessibilityRole="button"
225 - accessibilityLabel="Cancel search"
226 - onPress={() => {
227 - cancelSearch();
228 - fieldRef.current?.blur();
229 - }}
230 - className="flex-1 items-center justify-center"
231 - >
232 - <SymbolView name="xmark" size={20} tintColorClassName="accent-icon" />
233 - </Pressable>
234 - </GlassSurface>
235 - )}
236 - </AboveKeyboard>
237 - ) : null}
210 </>
211 );
212 }
apps/mobile/src/features/workspace/useSystemWorkspaceTabBar.ts
+8 -1
@@ -41,7 +41,14 @@ export function useCompactWorkspaceTabs() {
41
42 export function useSystemWorkspaceTabBar() {
43 const deviceType = useDeviceType();
44 + const { layout } = useAdaptiveWorkspaceLayout();
45 const sidebarTabs = useSidebarWorkspaceTabs();
46 const compactTabs = useCompactWorkspaceTabs();
46 - return Platform.OS === "ios" && deviceType !== "pad" && sidebarTabs === null && !compactTabs;
47 + return (
48 + Platform.OS === "ios" &&
49 + deviceType !== "pad" &&
50 + !layout.primarySidebarOverlaysContent &&
51 + sidebarTabs === null &&
52 + !compactTabs
53 + );
54 }
apps/mobile/src/lib/layout.test.ts
+34
@@ -50,6 +50,40 @@ describe("deriveThreadFeedInitialContentInset", () => {
50 });
51
52 describe("native workspace sizing", () => {
53 + it.each([
54 + { width: 669, height: 951, hasHinge: true, nativeWorkspace: true, overlay: true },
55 + { width: 951, height: 669, hasHinge: true, nativeWorkspace: true, overlay: false },
56 + { width: 669, height: 951, hasHinge: false, nativeWorkspace: true, overlay: false },
57 + { width: 669, height: 951, hasHinge: true, nativeWorkspace: false, overlay: false },
58 + ])(
59 + "overlays only a native unfolded portrait Duo sidebar: %j",
60 + ({ overlay, nativeWorkspace, ...size }) => {
61 + const nativeMetrics = {
62 + ...size,
63 + horizontalSizeClass: "regular" as const,
64 + verticalBarEdge: "none" as const,
65 + safeArea: { top: 24, bottom: 20, left: 0, right: 0 },
66 + reservedRegions: [],
67 + };
68 + const layout = deriveLayout({ ...size, nativeMetrics, nativeWorkspace });
69 + expect(layout.primarySidebarOverlaysContent).toBe(overlay);
70 + for (const primarySidebarPreferredVisible of [true, false]) {
71 + expect(
72 + deriveWorkspacePaneLayout({
73 + layout,
74 + viewportWidth: size.width,
75 + primarySidebarPreferredVisible,
76 + auxiliaryPanePreferredVisible: false,
77 + }).contentPaneWidth,
78 + ).toBe(
79 + !overlay && primarySidebarPreferredVisible
80 + ? size.width - (layout.listPaneWidth ?? 0)
81 + : size.width,
82 + );
83 + }
84 + },
85 + );
86 +
87 it("keeps the detail mounted in a narrow iPad window while UIKit still has two columns", () => {
88 const nativeMetrics = {
89 width: 715,
apps/mobile/src/lib/layout.ts
+9 -3
@@ -51,6 +51,7 @@ export type LayoutVariant = "compact" | "split";
51 export interface Layout {
52 readonly variant: LayoutVariant;
53 readonly usesSplitView: boolean;
54 + readonly primarySidebarOverlaysContent: boolean;
55 readonly listPaneWidth: number | null;
56 readonly listPaneGap?: number;
57 readonly shellPadding: number;
@@ -115,6 +116,7 @@ export function deriveLayout(input: {
116 return {
117 variant: "compact",
118 usesSplitView: false,
119 + primarySidebarOverlaysContent: false,
120 listPaneWidth: null,
121 shellPadding: 0,
122 };
@@ -130,6 +132,8 @@ export function deriveLayout(input: {
132 return {
133 variant: "split",
134 usesSplitView: true,
135 + primarySidebarOverlaysContent:
136 + input.nativeWorkspace === true && metrics?.hasHinge === true && width < height,
137 listPaneWidth:
138 division?.x ??
139 clamp(Math.round(width * 0.32), SPLIT_SIDEBAR_MIN_WIDTH, SPLIT_SIDEBAR_DEFAULT_MAX_WIDTH),
@@ -191,9 +195,10 @@ export function deriveWorkspacePaneLayout(input: {
195 const auxiliaryPaneRole = input.auxiliaryPaneRole ?? "supplementary";
196 const preferredPrimarySidebarVisible =
197 input.layout.usesSplitView && input.primarySidebarPreferredVisible;
194 - const preferredPrimarySidebarWidth = preferredPrimarySidebarVisible
195 - ? (input.layout.listPaneWidth ?? 0) + (input.layout.listPaneGap ?? 0)
196 - : 0;
198 + const preferredPrimarySidebarWidth =
199 + preferredPrimarySidebarVisible && !input.layout.primarySidebarOverlaysContent
200 + ? (input.layout.listPaneWidth ?? 0) + (input.layout.listPaneGap ?? 0)
201 + : 0;
202
203 if (auxiliaryPaneRole === "inspector") {
204 const fileInspector = deriveFileInspectorPaneLayout({
@@ -205,6 +210,7 @@ export function deriveWorkspacePaneLayout(input: {
210 const auxiliaryPaneVisible = fileInspector.supported && input.auxiliaryPanePreferredVisible;
211 const primarySidebarSuppressedByAuxiliary =
212 preferredPrimarySidebarVisible &&
213 + !input.layout.primarySidebarOverlaysContent &&
214 auxiliaryPaneVisible &&
215 fileInspector.width !== null &&
216 input.layout.listPaneWidth !== null &&
apps/mobile/src/lib/reserved-regions.test.ts
+22
@@ -21,6 +21,28 @@ describe("bottom controls around reserved regions", () => {
21 expect(innerDisplay.width - insets.left - insets.right).toBeGreaterThan(320);
22 });
23
24 + it("does not reserve a hinge twice when a native column starts at the division", () => {
25 + expect(
26 + deriveBottomControlInsets({
27 + ...innerDisplay,
28 + width: 412,
29 + safeArea: { top: 82, bottom: 34, left: 0, right: 0 },
30 + reservedRegions: [{ kind: "division", x: 0, y: 0, width: 40, height: 560 }],
31 + }),
32 + ).toEqual({ left: 0, right: 0, bottom: 0 });
33 + });
34 +
35 + it("keeps a native column's trailing division at its existing edge", () => {
36 + expect(
37 + deriveBottomControlInsets({
38 + ...innerDisplay,
39 + width: 456,
40 + safeArea: { top: 82, bottom: 34, left: 0, right: 0 },
41 + reservedRegions: [{ kind: "division", x: 455.75, y: 0, width: 0.25, height: 560 }],
42 + }),
43 + ).toEqual({ left: 0, right: 0, bottom: 0 });
44 + });
45 +
46 it("keeps controls below a horizontal fold in a hands-free pose", () => {
47 expect(
48 deriveBottomControlInsets({
apps/mobile/src/lib/reserved-regions.ts
+3
@@ -35,6 +35,9 @@ export function deriveBottomControlInsets(metrics: NativeLayoutMetrics | null) {
35 const endY = Math.min(bottom, region.y + region.height);
36 if (endX <= x || endY <= y) continue;
37 if (region.kind === "division" && region.height >= metrics.height / 2) {
38 + // A native column ending at a division is already split there. Only an
39 + // interior division needs to move these controls into one side of the view.
40 + if (x <= left || endX >= right) continue;
41 if (right - endX >= x - left) left = endX;
42 else right = x;
43 } else if (endY >= bottom - metrics.safeArea.bottom) {
apps/mobile/src/native/V5StackHeader.ios.tsx
+8 -24
@@ -205,12 +205,14 @@ export function V5StackHeader(props: {
205 }
206 // UIKit doesn't stack a column's toolbar against the workspace tab bar, which owns the
207 // bottom of the vertical bar and draws over it. Those columns keep the group in their
208 - // navigation items. An expanded sidebar's toolbar stays horizontal, outside the bar.
208 + // navigation items. Integrated search stays in the column's horizontal bottom toolbar.
209 if (
210 props.column &&
211 nativeMetrics &&
212 nativeMetrics.verticalBarEdge !== "none" &&
213 - (props.column === "detail" || nativeMetrics.horizontalSizeClass === "compact")
213 + (props.column === "detail" ||
214 + (nativeMetrics.horizontalSizeClass === "compact" &&
215 + !toolbar.some((item) => item.type === "searchBarPlacement")))
216 ) {
217 if (trailing.length && bottom.length)
218 trailing.push({ type: "spacer", id: "toolbar-group", sizing: "fixed", width: 8 });
@@ -225,15 +227,9 @@ export function V5StackHeader(props: {
227 icon: { type: "sfSymbol", name: "square.and.pencil" },
228 onPress: props.onCompose,
229 };
228 - if (deviceType === "duo-unfolded") {
229 - if (leading.length)
230 - leading.unshift({ type: "spacer", id: "compose-group", sizing: "fixed", width: 8 });
231 - leading.unshift(compose);
232 - } else {
233 - if (trailing.length)
234 - trailing.push({ type: "spacer", id: "compose-group", sizing: "fixed", width: 8 });
235 - trailing.push(compose);
236 - }
230 + if (trailing.length)
231 + trailing.push({ type: "spacer", id: "compose-group", sizing: "fixed", width: 8 });
232 + trailing.push(compose);
233 }
234 const left = options.headerLeft?.(itemProps);
235 const right = options.headerRight?.(itemProps);
@@ -248,20 +244,9 @@ export function V5StackHeader(props: {
244 : undefined;
245 const searchOptions = options.headerSearchBarOptions;
246 const autofocusRef = searchOptions?.ref ?? searchRef;
251 - const searchHasFocus = useRef(false);
247 useEffect(() => {
253 - searchHasFocus.current = false;
248 if (!searchOptions?.autoFocus) return;
255 - // UIKit attaches integrated search during the toolbar transition. Native
256 - // onFocus acknowledges readiness; a single frame can reach it too early.
257 - const deadline = Date.now() + 500;
258 - let frame = 0;
259 - const focusWhenAttached = () => {
260 - if (searchHasFocus.current) return;
261 - autofocusRef.current?.focus();
262 - if (Date.now() < deadline) frame = requestAnimationFrame(focusWhenAttached);
263 - };
264 - frame = requestAnimationFrame(focusWhenAttached);
249 + const frame = requestAnimationFrame(() => autofocusRef.current?.focus());
250 return () => cancelAnimationFrame(frame);
251 }, [searchOptions?.autoFocus, autofocusRef]);
252 const titleStyle = StyleSheet.flatten(options.headerTitleStyle);
@@ -305,7 +290,6 @@ export function V5StackHeader(props: {
290 placement={bottomSearch ? "integrated" : (searchOptions?.placement ?? "automatic")}
291 placeholder={mailSearch?.placeholder ?? searchOptions?.placeholder ?? "Search"}
292 onFocus={(event) => {
308 - searchHasFocus.current = true;
293 searchOptions?.onFocus?.(event);
294 }}
295 onChangeText={(event) => {
apps/mobile/src/native/v5-workspace-context.tsx
+1
@@ -7,6 +7,7 @@ export const NativeWorkspaceTabActivityContext = createContext<{
7 readonly isActive: () => boolean;
8 } | null>(null);
9 export const NativePrimaryColumnContext = createContext<{
10 + readonly presented: boolean;
11 readonly selectedThreadKey: string | null;
12 readonly selectedPullRequestKey: string | null;
13 } | null>(null);
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.37).
4 +[T3 Screens fork](https://github.com/PixPMusic/react-native-screens/tree/t3-v5.0.0-t3.43).
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.
pnpm-lock.yaml
+9 -9
@@ -553,7 +553,7 @@ importers:
553 version: 7.5.1(react-native@0.88.0(@babel/core@7.29.7(supports-color@8.1.1))(@react-native/metro-config@0.88.0(@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 '@react-navigation/native-stack':
555 specifier: 7.21.0
556 - version: 7.21.0(patch_hash=990d575444c4af2ce8218b3b7a8280fe244c03abbdb32b822a2e862f791dbf42)(110925a0d7a34aa12f32b4b743079ccc)
556 + version: 7.21.0(patch_hash=990d575444c4af2ce8218b3b7a8280fe244c03abbdb32b822a2e862f791dbf42)(52d9b4ccdf06285c715244e02709d347)
557 '@shikijs/core':
558 specifier: 4.2.0
559 version: 4.2.0
@@ -765,8 +765,8 @@ importers:
765 specifier: ~5.10.1
766 version: 5.10.1(react-native@0.88.0(@babel/core@7.29.7(supports-color@8.1.1))(@react-native/metro-config@0.88.0(@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)
767 react-native-screens:
768 - specifier: file:deps/react-native-screens-5.0.0-t3.37.tgz
769 - version: file:apps/mobile/deps/react-native-screens-5.0.0-t3.37.tgz(react-native@0.88.0(@babel/core@7.29.7(supports-color@8.1.1))(@react-native/metro-config@0.88.0(@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)
768 + specifier: file:deps/react-native-screens-5.0.0-t3.43.tgz
769 + version: file:apps/mobile/deps/react-native-screens-5.0.0-t3.43.tgz(react-native@0.88.0(@babel/core@7.29.7(supports-color@8.1.1))(@react-native/metro-config@0.88.0(@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)
770 react-native-shiki-engine:
771 specifier: ^0.3.12
772 version: 0.3.12(react-native@0.88.0(@babel/core@7.29.7(supports-color@8.1.1))(@react-native/metro-config@0.88.0(@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)
@@ -10675,9 +10675,9 @@ packages:
10675 react: '*'
10676 react-native: '*'
10677
10678 - react-native-screens@file:apps/mobile/deps/react-native-screens-5.0.0-t3.37.tgz:
10679 - resolution: {integrity: sha512-LMm9e8lHseFaUYKF4tFkGkqpJFu36uwp6ZGQgBYksn+pmcx0voaSMkK0tGaZ59LFXXD2TGoBR3K9kAX++72Xig==, tarball: file:apps/mobile/deps/react-native-screens-5.0.0-t3.37.tgz}
10680 - version: 5.0.0-t3.37
10678 + react-native-screens@file:apps/mobile/deps/react-native-screens-5.0.0-t3.43.tgz:
10679 + resolution: {integrity: sha512-kknkDmA26Vygu00QP5bThYHiSdbjJNxLncFSLEKC22lCZ7LAzuQJkC44ra53b1VEcP9TPKsQHKK8ateJNvNE2Q==, tarball: file:apps/mobile/deps/react-native-screens-5.0.0-t3.43.tgz}
10680 + version: 5.0.0-t3.43
10681 peerDependencies:
10682 react: '*'
10683 react-native: '*'
@@ -15618,7 +15618,7 @@ snapshots:
15618 optionalDependencies:
15619 '@react-native-masked-view/masked-view': 0.3.2(react-native@0.88.0(@babel/core@7.29.7(supports-color@8.1.1))(@react-native/metro-config@0.88.0(@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)
15620
15621 - '@react-navigation/native-stack@7.21.0(patch_hash=990d575444c4af2ce8218b3b7a8280fe244c03abbdb32b822a2e862f791dbf42)(110925a0d7a34aa12f32b4b743079ccc)':
15621 + '@react-navigation/native-stack@7.21.0(patch_hash=990d575444c4af2ce8218b3b7a8280fe244c03abbdb32b822a2e862f791dbf42)(52d9b4ccdf06285c715244e02709d347)':
15622 dependencies:
15623 '@react-navigation/elements': 2.9.45(d8845bac868f4d8a58c8a8f12ad0d4a5)
15624 '@react-navigation/native': 7.5.1(react-native@0.88.0(@babel/core@7.29.7(supports-color@8.1.1))(@react-native/metro-config@0.88.0(@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)
@@ -15626,7 +15626,7 @@ snapshots:
15626 react: 19.3.0
15627 react-native: 0.88.0(@babel/core@7.29.7(supports-color@8.1.1))(@react-native/metro-config@0.88.0(@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)
15628 react-native-safe-area-context: 5.10.1(react-native@0.88.0(@babel/core@7.29.7(supports-color@8.1.1))(@react-native/metro-config@0.88.0(@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)
15629 - react-native-screens: file:apps/mobile/deps/react-native-screens-5.0.0-t3.37.tgz(react-native@0.88.0(@babel/core@7.29.7(supports-color@8.1.1))(@react-native/metro-config@0.88.0(@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)
15629 + react-native-screens: file:apps/mobile/deps/react-native-screens-5.0.0-t3.43.tgz(react-native@0.88.0(@babel/core@7.29.7(supports-color@8.1.1))(@react-native/metro-config@0.88.0(@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)
15630 sf-symbols-typescript: 2.2.0
15631 warn-once: 0.1.1
15632 transitivePeerDependencies:
@@ -21212,7 +21212,7 @@ snapshots:
21212 react: 19.3.0
21213 react-native: 0.88.0(@babel/core@7.29.7(supports-color@8.1.1))(@react-native/metro-config@0.88.0(@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)
21214
21215 - react-native-screens@file:apps/mobile/deps/react-native-screens-5.0.0-t3.37.tgz(react-native@0.88.0(@babel/core@7.29.7(supports-color@8.1.1))(@react-native/metro-config@0.88.0(@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):
21215 + react-native-screens@file:apps/mobile/deps/react-native-screens-5.0.0-t3.43.tgz(react-native@0.88.0(@babel/core@7.29.7(supports-color@8.1.1))(@react-native/metro-config@0.88.0(@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):
21216 dependencies:
21217 react: 19.3.0
21218 react-freeze: 1.0.4(react@19.3.0)