Skip to content

armgit / cindy

Public Imported from GitHub
0

Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。

fix(mobile): 项目任务列表顶部去掉标题栏下的空白 (#5464)

Dash75516649929f
diff --git a/apps/mobile/app/devices/[deviceId].tsx b/apps/mobile/app/devices/[deviceId].tsx
index 9dc9fa8711..d8fbf4f3a0 100644
--- a/apps/mobile/app/devices/[deviceId].tsx
+++ b/apps/mobile/app/devices/[deviceId].tsx
@@ -1,4 +1,5 @@
import { useIsFocused, useLocalSearchParams, useRouter } from 'expo-router';
+import { useHeaderHeight } from 'expo-router/react-navigation';
import { useCallback, useContext, useEffect, useMemo, useRef, useState } from 'react';
import { useSharedValue } from 'react-native-reanimated';
import {
@@ -34,6 +35,7 @@ import {
SimpleStackHeader,
simpleScrollInsetProps,
simpleScrollScreenSafeAreaEdges,
+ usesNativeStackHeader,
} from '@/platform/chrome';
import { buildMainWindowLayout } from '@/components/mainWindowLayout';
import { useDeviceLink } from '@/device-link/DeviceLinkContext';
@@ -203,6 +205,7 @@ function DeviceDetailScreenContent() {
const [searchOpen, setSearchOpen] = useState(false);
const [searchFilterOpen, setSearchFilterOpen] = useState(false);
const insets = useSafeAreaInsets();
+ const headerHeight = useHeaderHeight();
const [loading, setLoading] = useState(false);
const [error, setError] = useState<string | null>(null);
// 熔断 open(电脑端未响应):relay 可能仍 online,可见性与 banner 文案单独入参。
@@ -757,9 +760,23 @@ function DeviceDetailScreenContent() {
// 整台电脑模式(无 workingDir)继续走下面完整的 console 布局。
if (projectWorkingDir) {
const projectItems = sections.flatMap((section) => section.data);
+ const connectionBanner = showConnectionBanner ? (
+ <ConnectionBanner
+ deviceUnresponsive={deviceUnresponsive}
+ error={error}
+ issue={connectionIssue}
+ lastSyncedAt={lastSyncedAt}
+ loading={loading}
+ onSync={() => void loadSessions()}
+ status={status}
+ />
+ ) : null;
+ // iOS 顶栏透明、内容铺到顶栏下:搜索入口放进列表头,由列表让出顶栏高度;不透明顶栏在
+ // iOS 26+ 会被 react-native-screens 再垫一层顶部安全区,标题栏下方出现大块空白。
return (
<SafeAreaView edges={simpleScrollScreenSafeAreaEdges()} style={styles.safeArea} testID="deviceDetail.screen">
<SimpleStackHeader
+ scrollEdge
syncing={!showConnectionBanner && (loading || status === 'connecting')}
action={{
label: t('devices.common.create'),
@@ -780,53 +797,10 @@ function DeviceDetailScreenContent() {
title={projectName ?? deviceName}
titleTestID="deviceDetail.title"
/>
- {showConnectionBanner ? (
- <ConnectionBanner
- deviceUnresponsive={deviceUnresponsive}
- error={error}
- issue={connectionIssue}
- lastSyncedAt={lastSyncedAt}
- loading={loading}
- onSync={() => void loadSessions()}
- status={status}
- />
- ) : null}
- <View style={styles.projectSearchChrome}>
- {searchOpen || !!searchQuery.trim() ? (
- <HomeSearchBar
- autoFocus={searchOpen && !searchQuery}
- filterA11y={searchFilterA11y}
- filterActions={searchFilterMenu.filterActions}
- filterActive={indexedSearch.activeFilterCount > 0}
- onChangeQuery={setSearchQuery}
- onDismiss={() => setSearchOpen(false)}
- onFilterAction={searchFilterMenu.onFilterAction}
- onOpenFilter={() => setSearchFilterOpen(true)}
- padded={false}
- query={searchQuery}
- testIDs={{
- clear: 'deviceDetail.projectSearchCloseButton',
- filter: 'deviceDetail.projectSearchFilterButton',
- input: 'deviceDetail.projectSearchInput',
- row: 'deviceDetail.projectSearchRow',
- }}
- />
- ) : (
- <MainWindowActionGroup
- density="compact"
- secondaryActions={[
- {
- accessibilityLabel: t('devices.detail.search.openA11y'),
- active: false,
- label: t('devices.detail.search.label'),
- onPress: () => setSearchOpen(true),
- testID: 'deviceDetail.projectSearchToggleButton',
- },
- ]}
- testID="deviceDetail.projectSearchActions"
- />
- )}
- </View>
+ {/* 连接提示只是零高度锚点;iOS 内容区从屏幕顶开始,锚点挪到顶栏下沿。 */}
+ {usesNativeStackHeader()
+ ? <View pointerEvents="box-none" style={[styles.projectConnectionAnchor, { top: headerHeight }]}>{connectionBanner}</View>
+ : connectionBanner}
<ListDisclosureScope controller={disclosure.controller}>
<SectionList
CellRendererComponent={DeviceListCell}
@@ -843,6 +817,42 @@ function DeviceDetailScreenContent() {
renderSectionHeader={() => null}
contentContainerStyle={[styles.listContent, { paddingBottom: spacing.xxl }]}
testID="deviceDetail.projectSessionList"
+ ListHeaderComponent={<View style={styles.projectSearchChrome}>
+ {searchOpen || !!searchQuery.trim() ? (
+ <HomeSearchBar
+ autoFocus={searchOpen && !searchQuery}
+ filterA11y={searchFilterA11y}
+ filterActions={searchFilterMenu.filterActions}
+ filterActive={indexedSearch.activeFilterCount > 0}
+ onChangeQuery={setSearchQuery}
+ onDismiss={() => setSearchOpen(false)}
+ onFilterAction={searchFilterMenu.onFilterAction}
+ onOpenFilter={() => setSearchFilterOpen(true)}
+ padded={false}
+ query={searchQuery}
+ testIDs={{
+ clear: 'deviceDetail.projectSearchCloseButton',
+ filter: 'deviceDetail.projectSearchFilterButton',
+ input: 'deviceDetail.projectSearchInput',
+ row: 'deviceDetail.projectSearchRow',
+ }}
+ />
+ ) : (
+ <MainWindowActionGroup
+ density="compact"
+ secondaryActions={[
+ {
+ accessibilityLabel: t('devices.detail.search.openA11y'),
+ active: false,
+ label: t('devices.detail.search.label'),
+ onPress: () => setSearchOpen(true),
+ testID: 'deviceDetail.projectSearchToggleButton',
+ },
+ ]}
+ testID="deviceDetail.projectSearchActions"
+ />
+ )}
+ </View>}
renderItem={({ item, index, section }) => (
<DeviceDetailSessionRow
asBlock
@@ -1445,10 +1455,8 @@ const makeStyles = (colors: ThemeColors) => StyleSheet.create({
fontWeight: fontWeight.regular,
minWidth: 0,
},
- projectSearchChrome: {
- paddingHorizontal: spacing.lg,
- paddingTop: spacing.sm,
- },
+ projectConnectionAnchor: { left: 0, position: 'absolute', right: 0 },
+ projectSearchChrome: { paddingBottom: spacing.sm },
segmentScroll: {
marginHorizontal: -spacing.lg,
},
diff --git a/apps/mobile/src/__tests__/deviceDetailProjectHeaderLayout.test.ts b/apps/mobile/src/__tests__/deviceDetailProjectHeaderLayout.test.ts
new file mode 100644
index 0000000000..461c1f20e5
--- /dev/null
+++ b/apps/mobile/src/__tests__/deviceDetailProjectHeaderLayout.test.ts
@@ -0,0 +1,42 @@
+import { readFileSync } from 'node:fs';
+import { resolve } from 'node:path';
+import { describe, expect, it } from 'vitest';
+
+const source = readFileSync(
+ resolve(process.cwd(), 'app/devices/[deviceId].tsx'),
+ 'utf8',
+);
+
+// 项目作用域页:iOS 不透明顶栏在 iOS 26+ 会被 react-native-screens 再垫一层顶部安全区,
+// 标题栏下出现大块空白。页面必须走透明顶栏 + 由列表让出顶栏高度的整页滚动布局。
+function projectScopeBranch(): string {
+ const start = source.indexOf('if (projectWorkingDir) {');
+ const end = source.indexOf('</ListDisclosureScope>', start);
+ expect(start).toBeGreaterThan(0);
+ expect(end).toBeGreaterThan(start);
+ return source.slice(start, end);
+}
+
+describe('device detail project scope header layout', () => {
+ it('uses the transparent scroll-edge header', () => {
+ const branch = projectScopeBranch();
+ const header = branch.slice(branch.indexOf('<SimpleStackHeader'), branch.indexOf('/>', branch.indexOf('titleTestID="deviceDetail.title"')));
+
+ expect(branch).toContain('simpleScrollScreenSafeAreaEdges()');
+ expect(header).toMatch(/^\s+scrollEdge\r?$/m);
+ });
+
+ it('renders the search entry inside the inset-adjusted list header', () => {
+ const branch = projectScopeBranch();
+ const listStart = branch.indexOf('<SectionList');
+ const listHeader = branch.indexOf('ListHeaderComponent=', listStart);
+ const searchActions = branch.indexOf('testID="deviceDetail.projectSearchActions"');
+ const searchRow = branch.indexOf("row: 'deviceDetail.projectSearchRow'");
+
+ expect(listStart).toBeGreaterThan(0);
+ expect(branch.slice(listStart, listHeader)).toContain('{...simpleScrollInsetProps}');
+ expect(listHeader).toBeGreaterThan(listStart);
+ expect(searchActions).toBeGreaterThan(listHeader);
+ expect(searchRow).toBeGreaterThan(listHeader);
+ });
+});