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): 打开伙伴标题回退菜单前收起键盘

nana6ead489c7543
diff --git a/apps/mobile/src/__tests__/TeammateHomeScreen.test.tsx b/apps/mobile/src/__tests__/TeammateHomeScreen.test.tsx
index e9d8710413..1b7616b4b5 100644
--- a/apps/mobile/src/__tests__/TeammateHomeScreen.test.tsx
+++ b/apps/mobile/src/__tests__/TeammateHomeScreen.test.tsx
@@ -10,7 +10,7 @@ const h = vi.hoisted(() => ({
auth: { user: { id: 'owner' }, accountGeneration: 1, logout: vi.fn(), beginAddAccount: vi.fn() },
nav: { hydrated: true, lastTeammate: null as LastTeammateIdentity | null, mode: 'teammates' as HomeMode,
saveFailed: false, openTeammate: vi.fn(), setMode: vi.fn(), chooseMode: vi.fn() },
- modeMenu: {} as any,
+ modeMenu: {} as any, nativeMenus: true,
roster: { createTargets: [], authoritative: true, items: [] as HostedRemoteCollectionItem[], loading: false, refreshing: false, error: null as string | null,
isOnline: vi.fn(() => true), refresh: vi.fn(), groupTargets: [] as { deviceId: string; deviceName: string }[] },
groups: { loading: false, refreshing: false, error: null as string | null, items: [] as HostedRemoteCollectionItem[], supported: false, isOnline: () => true, refresh: vi.fn() },
@@ -21,7 +21,7 @@ vi.mock('react-native', async () => {
const { createElement: el } = await import('react');
return { View: ({ children }: any) => el('div', {}, children), ActivityIndicator: () => null,
Pressable: ({ children, onPress }: any) => el('button', { onClick: onPress }, children),
- Keyboard: { dismiss() {} }, Alert: { alert: vi.fn() }, StyleSheet: { create: (value: unknown) => value } };
+ Keyboard: { dismiss: vi.fn() }, Alert: { alert: vi.fn() }, StyleSheet: { create: (value: unknown) => value } };
});
vi.mock('expo-router', () => ({ Stack: { Screen: () => null }, useIsFocused: () => h.focused, useNavigation: () => ({ getState: () => ({ routes: [] }) }), useRouter: () => ({ dismissTo: h.dismissTo, replace: h.replace }) }));
vi.mock('react-native-safe-area-context', () => ({ SafeAreaView: 'div' }));
@@ -34,7 +34,7 @@ vi.mock('@/utils/useGuardedPush', () => ({ useGuardedPush: () => h.push }));
vi.mock('@/device-link/remoteStatus', () => ({ formatRemoteError: String }));
vi.mock('@/session/TeammateCreateButton', () => ({ TeammateCreateButton: (props: any) => { if (props.appearance !== 'cta') h.create = props; return null; } }));
vi.mock('@/session/HomeChromeDrawer', () => ({ HomeChromeDrawer: (props: unknown) => { h.drawer = props; return null; } }));
-vi.mock('@/platform/chrome', () => ({ NativePullDownMenu: (props: any) => { h.modeMenu = props; return props.children; }, usesNativePullDownMenu: () => true }));
+vi.mock('@/platform/chrome', () => ({ NativePullDownMenu: (props: any) => { h.modeMenu = props; return props.children; }, usesNativePullDownMenu: () => h.nativeMenus }));
vi.mock('@/session/AccountSwitcherSheet', () => ({ AccountSwitcherSheet: (props: unknown) => { h.accounts = props; return null; } }));
vi.mock('@/session/HomeHeaderGlassButton', () => ({ HomeHeaderGlassButton: () => null }));
vi.mock('@/session/TeammateList', () => ({ TeammateList: (props: unknown) => { h.list = props; return null; } }));
@@ -54,6 +54,7 @@ vi.mock('@/session/remoteSessionStore', () => ({
useRemoteHomeSessions: () => [], useRemoteHomeStatusVersion: () => 0,
}));
import HomeScreen from '../../app/devices/index';
+import { Keyboard } from 'react-native';
import { TeammateHomeScreen } from '@/session/TeammateHomeScreen';
import { teammateIdentity } from '@/session/teammateNavigation';
Object.assign(globalThis, { IS_REACT_ACT_ENVIRONMENT: true });
@@ -67,7 +68,7 @@ beforeEach(() => {
h.auth.user = { id: `owner-${++serial}` }; h.auth.accountGeneration = serial;
vi.clearAllMocks(); h.focused = true; h.nav.lastTeammate = teammateIdentity(teammate); h.roster.items = [teammate];
h.nav.mode = 'teammates'; h.nav.chooseMode.mockReset(); h.roster.authoritative = true;
- h.modeMenu = {};
+ h.modeMenu = {}; h.nativeMenus = true;
h.groups.loading = false; h.groups.refreshing = false; h.groups.error = null;
h.roster.loading = false; h.roster.error = null; h.roster.isOnline.mockReturnValue(true);
});
@@ -103,6 +104,19 @@ describe('teammate home entry', () => {
await act(async () => h.modeMenu.onAction('tasks'));
expect(h.nav.chooseMode).toHaveBeenCalledWith('tasks');
});
+ it('dismisses search before opening the title fallback drawer and switching to tasks', async () => {
+ h.nativeMenus = false;
+ await render();
+ expect(h.drawer.open).toBe(false);
+ await act(async () => h.modeMenu.children.props.onPress());
+ expect(Keyboard.dismiss).toHaveBeenCalledOnce();
+ expect(h.drawer.open).toBe(true);
+ await act(async () => h.drawer.onModeChange('tasks'));
+ expect(h.nav.setMode).not.toHaveBeenCalled();
+ await act(async () => h.drawer.onClosed());
+ expect(h.nav.setMode).toHaveBeenCalledExactlyOnceWith('tasks');
+ expect(Keyboard.dismiss).toHaveBeenCalledOnce();
+ });
});
// Exercise the real page, shared preferences, mode panes and navigation together.
diff --git a/apps/mobile/src/session/TeammateHomeScreen.tsx b/apps/mobile/src/session/TeammateHomeScreen.tsx
index a3cdd84b3a..c41fd851d3 100644
--- a/apps/mobile/src/session/TeammateHomeScreen.tsx
+++ b/apps/mobile/src/session/TeammateHomeScreen.tsx
@@ -85,7 +85,7 @@ export function TeammateHomeScreen({ active = true }: { active?: boolean }) {
<Pressable
accessibilityLabel={t('devices.companions.title')}
accessibilityRole="button"
- onPress={nativeMenus ? undefined : () => setDrawer(true)}
+ onPress={nativeMenus ? undefined : () => { Keyboard.dismiss(); setDrawer(true); }}
style={({ pressed }) => [styles.titleTrigger, pressed && styles.pressed]}
testID="teammates.modeMenu"
>