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): keep iOS rename actions inside the native sheet (#6111)

DavidShenXD786ad0c17557
diff --git a/apps/mobile/e2e/maestro/visual_session_controls_session.yaml b/apps/mobile/e2e/maestro/visual_session_controls_session.yaml
index eb88a06d29..fe2ab2f2f7 100644
--- a/apps/mobile/e2e/maestro/visual_session_controls_session.yaml
+++ b/apps/mobile/e2e/maestro/visual_session_controls_session.yaml
@@ -17,7 +17,7 @@ appId: ${APP_ID}
id: "session.controlsToggle"
- extendedWaitUntil:
visible:
- id: "session.menuSheet"
+ id: "session.menuUsageRow"
timeout: 10000
- assertVisible:
id: "session.renameAction"
@@ -35,5 +35,34 @@ appId: ${APP_ID}
id: "session.renameAction"
- assertVisible:
id: "session.renameInput"
+- assertVisible:
+ id: "session.renameButton"
+- assertVisible:
+ id: "session.renameCancelButton"
- takeScreenshot:
path: visual-session-controls-rename
+# Exercise real taps while the keyboard is up; an accessibility-visible editor
+# alone does not catch a footer that overflows its native sheet viewport.
+- tapOn:
+ id: "session.renameCancelButton"
+- assertNotVisible:
+ id: "session.renameInput"
+- tapOn:
+ id: "session.renameAction"
+- tapOn:
+ id: "session.renameButton"
+- assertNotVisible:
+ id: "session.renameInput"
+- tapOn:
+ id: "session.renameAction"
+- hideKeyboard
+- assertVisible:
+ id: "session.renameButton"
+- assertVisible:
+ id: "session.renameCancelButton"
+- takeScreenshot:
+ path: visual-session-controls-rename-keyboard-hidden
+- tapOn:
+ id: "session.renameCancelButton"
+- assertNotVisible:
+ id: "session.renameInput"
diff --git a/apps/mobile/src/__tests__/visualMock.test.ts b/apps/mobile/src/__tests__/visualMock.test.ts
index 5ebf6d586e..879c492b7f 100644
--- a/apps/mobile/src/__tests__/visualMock.test.ts
+++ b/apps/mobile/src/__tests__/visualMock.test.ts
@@ -125,6 +125,19 @@ it('supplies the task tag catalog required when opening session options', async
.toMatchObject({ tags: [], sessions: [{ sessionId: 'session-primary', tags: [] }] });
});
+it('generates a rename draft without changing the demo task title', async () => {
+ const mock = await import('@/debug/visualMock');
+ const link = mock.createVisualMockDeviceLinkContext();
+ const readSession = () => link.invoke<{ title: string }>(mock.VISUAL_MOCK_DEVICE_ID,
+ 'local-db:sessions:get', [mock.VISUAL_MOCK_SESSION_ID]);
+ const original = await readSession();
+ const draft = await link.invoke<{ title: string }>(mock.VISUAL_MOCK_DEVICE_ID,
+ 'maker:regenerate-title', [{ sessionId: mock.VISUAL_MOCK_SESSION_ID }]);
+ expect(draft.title.trim()).not.toBe('');
+ expect(draft.title).not.toBe(original.title);
+ expect((await readSession()).title).toBe(original.title);
+});
+
it('projects imported history rows without falling back to synthetic messages', async () => {
config.MOBILE_VISUAL_MOCK_REALDATA_URL = 'https://fixture.invalid/snapshot.json';
const rows: RemoteMessage[] = [{ id: 'real-message', clientId: 'real-message',
diff --git a/apps/mobile/src/debug/visualMock.ts b/apps/mobile/src/debug/visualMock.ts
index f122ee06ec..f8e729aee5 100644
--- a/apps/mobile/src/debug/visualMock.ts
+++ b/apps/mobile/src/debug/visualMock.ts
@@ -254,6 +254,8 @@ async function visualMockInvoke<T = unknown>(
}
}
switch (channel) {
+ case 'maker:regenerate-title':
+ return { title: 'Visual rename draft' } as T;
case 'maker:predict-prompt':
return { prompt: (args[0] as { sessionId?: string } | undefined)?.sessionId === 'visual-prompt-recommendation'
? '继续跟进 PR #4670' : null } as T;
diff --git a/apps/mobile/src/session/SessionDetailsNative.ios.tsx b/apps/mobile/src/session/SessionDetailsNative.ios.tsx
index ad9d2a4994..d505556986 100644
--- a/apps/mobile/src/session/SessionDetailsNative.ios.tsx
+++ b/apps/mobile/src/session/SessionDetailsNative.ios.tsx
@@ -25,11 +25,10 @@ import {
presentationDragIndicator,
shapes,
} from "@expo/ui/swift-ui/modifiers";
-import { ScrollView, useWindowDimensions, View } from "react-native";
-import { useCallback, useEffect, useRef, useState } from "react";
+import { ScrollView, View } from "react-native";
+import { useState } from "react";
import { useSafeAreaInsets } from "react-native-safe-area-context";
import { radius, spacing, useTheme } from "@/theme";
-import { useMobileKeyboardState } from "./useMobileKeyboardState";
import type {
SessionDetailsAction,
SessionDetailsNativeProps,
@@ -48,7 +47,6 @@ export function SessionDetailsNative({
}: SessionDetailsNativeProps) {
const { colors, mode } = useTheme();
const { bottom: bottomInset } = useSafeAreaInsets();
- const keyboardOverlap = useKeyboardOverlap(!!footer && visible);
return (
<Host
colorScheme={mode}
@@ -78,7 +76,7 @@ export function SessionDetailsNative({
inset inside scroll content, not as an empty strip below its clip. */}
<Group modifiers={[padding({ bottom: footer ? 0 : -bottomInset })]}>
<RNHostView>
- <View ref={keyboardOverlap.ref} onLayout={keyboardOverlap.measure} style={{ flex: 1 }}>
+ <View style={{ flex: 1 }}>
<ScrollView
keyboardShouldPersistTaps="handled"
contentContainerStyle={{
@@ -89,14 +87,17 @@ export function SessionDetailsNative({
>
{children}
</ScrollView>
- {footer ? (
- <View style={{ padding: spacing.lg, paddingBottom: spacing.lg + keyboardOverlap.overlap }}>
- {footer}
- </View>
- ) : null}
</View>
</RNHostView>
</Group>
+ {/* Let SwiftUI reserve the footer's intrinsic height above its keyboard
+ safe area. A footer inside the filling RN host can overflow the
+ native viewport when the sheet changes detents. */}
+ {footer ? (
+ <RNHostView matchContents>
+ <View style={{ padding: spacing.lg }}>{footer}</View>
+ </RNHostView>
+ ) : null}
</VStack>
</Group>
</BottomSheet>
@@ -104,32 +105,6 @@ export function SessionDetailsNative({
);
}
-/**
- * 底部按钮被键盘挡住的高度。SwiftUI sheet 对内嵌 RN 内容的键盘避让不完整,底部
- * 按钮会被键盘盖住一截;这里按实际位置补齐:量内容区在窗口里的底边,与键盘顶边比较。
- * 量的是外层容器,尺寸不受补出的 padding 影响,不会来回抖动。
- */
-function useKeyboardOverlap(enabled: boolean) {
- const ref = useRef<View>(null);
- const keyboard = useMobileKeyboardState(enabled);
- const { height: windowHeight } = useWindowDimensions();
- const [bottom, setBottom] = useState<number | null>(null);
- const measure = useCallback(() => {
- ref.current?.measureInWindow((_x, y, _width, height) => setBottom(y + height));
- }, []);
- useEffect(() => {
- if (!enabled || !keyboard.visible) return;
- measure();
- // sheet 跟随键盘移动、展开的动画结束后再量一次,以最终位置为准。
- const timer = setTimeout(measure, 400);
- return () => clearTimeout(timer);
- }, [enabled, keyboard.height, keyboard.visible, measure]);
- const overlap = enabled && keyboard.visible && bottom !== null
- ? Math.max(0, Math.ceil(bottom - (windowHeight - keyboard.height)))
- : 0;
- return { ref, measure, overlap };
-}
-
export function SessionDetailsNativeActions({
actions,
}: {