diff --git a/mobile/src/session/MobileSessionActiveContent.tsx b/mobile/src/session/MobileSessionActiveContent.tsx index fe8e8038017..34af5e67f62 100644 --- a/mobile/src/session/MobileSessionActiveContent.tsx +++ b/mobile/src/session/MobileSessionActiveContent.tsx @@ -8,7 +8,7 @@ import { Animated, View, Text, Pressable, ActivityIndicator } from 'react-native import { saveTerminalTextScale } from '../storage/preferences' import { MobileBrowserPane } from '../browser/MobileBrowserPane' import { TerminalPaneView } from '../terminal/session/TerminalPaneView' -import { useMountedTerminalHandles } from '../terminal/session/mounted-terminal-lru' +import { MountedTerminalPanes } from '../terminal/session/mounted-terminal-lru' import { MobileNativeChatOverlay } from './native-chat/MobileNativeChatOverlay' import { mobileSessionNativeChatHostOutage } from './native-chat/mobile-native-chat-host-outage' import { MobileAgentMessageProvider } from './native-chat/transcript/MobileAgentMessageProvider' @@ -116,13 +116,6 @@ export function MobileSessionActiveContent({ showEmptyState, createTabBusy } = controller - const mountedTerminalHandles = useMountedTerminalHandles( - visibleTerminalHandles, - terminals.map((terminal) => terminal.handle) - ) - const mountedTerminals = terminals.filter((terminal) => - mountedTerminalHandles.includes(terminal.handle) - ) const { keyboardLift, activeTerminalKeyboardLift, toastAnimatedStyle } = useMobileSessionContentKeyboardLift(controller) const openUrlInOrca = useOpenUrlInOrca(controller) @@ -267,68 +260,70 @@ export function MobileSessionActiveContent({ ) : ( - {mountedTerminals.map((terminal) => ( - { - // Why: pinch-to-zoom reports a new preset; persist it so the size sticks across panes and launches. - terminalTextScaleRevisionRef.current += 1 - setTerminalTextScale(scale) - void saveTerminalTextScale(scale) - }} - onRef={setTerminalWebViewRef} - onDocumentReleased={releaseTerminalDocument} - onWebReady={handleTerminalWebReady} - onCellBoxChange={notifyTerminalCellBoxChange} - onSelectionMode={handleSelectionMode} - onSelectionCopy={handleSelectionCopy} - onSelectionEvicted={handleSelectionEvicted} - onClipboardWrite={handleClipboardWrite} - onModesChanged={handleModesChanged} - onKeyboardAvoidanceMetrics={handleKeyboardAvoidanceMetrics} - onHaptic={handleHaptic} - onTerminalInput={handleTerminalInput} - onTerminalQueryReply={handleTerminalQueryReply} - onTerminalInteraction={handleTerminalInteraction} - onTerminalTap={handleTerminalTap} - onFileTap={handleFileTap} - onOpenUrl={handleTerminalOpenUrl} - /> - ))} + + {(terminal) => ( + { + // Why: pinch-to-zoom reports a new preset; persist it so the size sticks across panes and launches. + terminalTextScaleRevisionRef.current += 1 + setTerminalTextScale(scale) + void saveTerminalTextScale(scale) + }} + onRef={setTerminalWebViewRef} + onDocumentReleased={releaseTerminalDocument} + onWebReady={handleTerminalWebReady} + onCellBoxChange={notifyTerminalCellBoxChange} + onSelectionMode={handleSelectionMode} + onSelectionCopy={handleSelectionCopy} + onSelectionEvicted={handleSelectionEvicted} + onClipboardWrite={handleClipboardWrite} + onModesChanged={handleModesChanged} + onKeyboardAvoidanceMetrics={handleKeyboardAvoidanceMetrics} + onHaptic={handleHaptic} + onTerminalInput={handleTerminalInput} + onTerminalQueryReply={handleTerminalQueryReply} + onTerminalInteraction={handleTerminalInteraction} + onTerminalTap={handleTerminalTap} + onFileTap={handleFileTap} + onOpenUrl={handleTerminalOpenUrl} + /> + )} + ({ + terminals, + visibleHandles, + children +}: { + terminals: readonly T[] + visibleHandles: readonly string[] + children: (terminal: T) => ReactNode +}): ReactNode { const [mounted, setMounted] = useState([]) - const next = nextMountedTerminalHandles(mounted, visible, live) + const next = nextMountedTerminalHandles( + mounted, + visibleHandles, + terminals.map((terminal) => terminal.handle) + ) if (next !== mounted) { setMounted(next) } - return next + return terminals.filter((terminal) => next.includes(terminal.handle)).map(children) }