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): 安卓输入法展开时 composer 底排按钮点按无响应

Zhang Yunjinbb52c26d2c95
diff --git a/apps/mobile/app/sessions/[sessionId].tsx b/apps/mobile/app/sessions/[sessionId].tsx
index c989cfabbe..e1388a222d 100644
--- a/apps/mobile/app/sessions/[sessionId].tsx
+++ b/apps/mobile/app/sessions/[sessionId].tsx
@@ -339,6 +339,7 @@ import {
mergeSlashCommands,
} from '@/session/composerPalette';
import { buildComposerTouchLayout } from '@/session/composerTouchLayout';
+import { useComposerPressFallback } from '@/session/composerPressFallback';
import { useComposerDock } from '@/session/composerMorph';
import { DockKeyboardLift, DockKeyboardViewportSpacer } from '@/session/ComposerDockKeyboardFollow';
import { useComposerPillOpen } from '@/session/useComposerPillOpen';
@@ -7367,6 +7368,7 @@ function SessionScreenContent({ beforeSessionSwitchRef, newSessionActionRef }: S
setModelSheetOpen(false);
setPermissionSheetOpen(true);
}}
+ pressInFallback
style={[
styles.composerInlineToolButton,
permissionSheetOpen && styles.composerToolButtonActive,
@@ -7536,6 +7538,7 @@ function SessionScreenContent({ beforeSessionSwitchRef, newSessionActionRef }: S
setContextSheetView('main');
setContextSheetOpen(true);
}}
+ pressInFallback
style={[
styles.composerInlineToolButton,
composerLayout.attachment.active && styles.composerToolButtonActive,
@@ -7624,6 +7627,7 @@ function SessionScreenContent({ beforeSessionSwitchRef, newSessionActionRef }: S
disabled={composerStopDisabled}
hitSlop={COMPOSER_CONTROL_HIT_SLOP}
onPress={stopSession}
+ pressInFallback
pressedStyle={styles.sendButtonPressed}
style={[
styles.sendButton,
@@ -7664,6 +7668,7 @@ function SessionScreenContent({ beforeSessionSwitchRef, newSessionActionRef }: S
hitSlop={COMPOSER_CONTROL_HIT_SLOP}
onLayout={measureSendButtonTarget}
onPress={send}
+ pressInFallback
pressedStyle={styles.sendButtonPressed}
style={[
styles.sendButton,
@@ -12693,6 +12698,11 @@ interface RouteActionButtonProps {
onPressIn?: PressableProps['onPressIn'];
onPressOut?: PressableProps['onPressOut'];
onResponderMove?: PressableProps['onResponderMove'];
+ /**
+ * 按下即生效的兜底(仅安卓启用):平台中途取消手势时 onPress 永不到达(按钮只闪
+ * 一下就没了),宽限到期后照样触发。正常松手仍然立即触发。详见 composerPressFallback。
+ */
+ pressInFallback?: boolean;
/** responder 被系统/滚动终止时的回调(正常松手不触发);语音按钮用它撤销按下即录。 */
onTouchCancel?: PressableProps['onTouchCancel'];
pressedStyle?: StyleProp<ViewStyle>;
@@ -12717,6 +12727,7 @@ const RouteActionButton = forwardRef<View, RouteActionButtonProps>(function Rout
onPressOut,
onResponderMove,
onTouchCancel,
+ pressInFallback = false,
pressedStyle,
style,
testID,
@@ -12725,6 +12736,27 @@ const RouteActionButton = forwardRef<View, RouteActionButtonProps>(function Rout
const resolvedDisabledStyle = disabledStyle === undefined ? styles.sendButtonDisabled : disabledStyle;
const resolvedPressedStyle = pressedStyle === undefined ? styles.routeButtonPressed : pressedStyle;
const interactionDisabled = disabled || busy || !onPress;
+ const pressFallback = useComposerPressFallback({
+ // 仅安卓启用:要修的是安卓中途取消手势;iOS 保持纯松手触发,长按不提前发送。
+ enabled: Platform.OS === 'android' && pressInFallback && !interactionDisabled,
+ onPress: () => onPress?.(),
+ });
+ const handlePressIn = useCallback((event: GestureResponderEvent) => {
+ pressFallback.beginPress(event.nativeEvent.pageX, event.nativeEvent.pageY);
+ onPressIn?.(event);
+ }, [onPressIn, pressFallback]);
+ const handlePress = useCallback(() => {
+ // 兜底已经先执行过动作:正常松手不再重复执行。
+ if (pressFallback.finishPress()) return;
+ onPress?.();
+ }, [onPress, pressFallback]);
+ // 漂移撤销必须走 Pressable 的官方 onPressMove 通道:RN 0.86.3 的 Pressable
+ // 不解构 onResponderMove(落入 restProps),render 时 {...eventHandlers} 在后
+ // 把它整个覆盖——挂 onResponderMove 的 move 处理器在真机上收不到事件,
+ // 12pt 漂移兑底形同虚设(划过发送键 300ms 后会误发)。
+ const handlePressMove = useCallback((event: GestureResponderEvent) => {
+ pressFallback.movePress(event.nativeEvent.pageX, event.nativeEvent.pageY);
+ }, [pressFallback]);
return (
<Pressable
ref={ref}
@@ -12741,8 +12773,9 @@ const RouteActionButton = forwardRef<View, RouteActionButtonProps>(function Rout
hitSlop={hitSlop}
onLayout={onLayout}
onLongPress={interactionDisabled ? undefined : onLongPress}
- onPress={interactionDisabled ? undefined : onPress}
- onPressIn={interactionDisabled ? undefined : onPressIn}
+ onPress={interactionDisabled ? undefined : handlePress}
+ onPressIn={interactionDisabled ? undefined : handlePressIn}
+ onPressMove={interactionDisabled ? undefined : handlePressMove}
onPressOut={interactionDisabled ? undefined : onPressOut}
onResponderMove={interactionDisabled ? undefined : onResponderMove}
onTouchCancel={interactionDisabled ? undefined : onTouchCancel}
@@ -12791,6 +12824,7 @@ function ComposerRuntimePill({
disabled={disabled}
hitSlop={COMPOSER_CONTROL_HIT_SLOP}
onPress={onPress}
+ pressInFallback
style={styles.composerRuntimePill}
testID={testID}
>
diff --git a/apps/mobile/src/__tests__/composerPressFallback.test.tsx b/apps/mobile/src/__tests__/composerPressFallback.test.tsx
new file mode 100644
index 0000000000..9253f298d1
--- /dev/null
+++ b/apps/mobile/src/__tests__/composerPressFallback.test.tsx
@@ -0,0 +1,100 @@
+/**
+ * 「按下即生效」兜底:安卓可能在一次按压的中途取消手势(第三方输入法抢输入焦点),
+ * `onPress` 永不到达,按钮只闪一下就没了。兜底必须做到:
+ * - 正常松手仍然立即触发一次(不能变成两次);
+ * - 手势被系统取消(只有按下、没有松手)时,宽限到期后照样触发;
+ * - 按下后明显拖动视为放弃,不触发(否则划过按钮就误发)。
+ */
+// @vitest-environment jsdom
+import { act, createElement } from 'react';
+import { createRoot, type Root } from 'react-dom/client';
+import { afterEach, beforeEach, expect, it, vi } from 'vitest';
+import {
+ COMPOSER_PRESS_FALLBACK_DELAY_MS,
+ useComposerPressFallback,
+ type ComposerPressFallback,
+} from '@/session/composerPressFallback';
+
+Object.assign(globalThis, { IS_REACT_ACT_ENVIRONMENT: true });
+let root: Root | undefined;
+beforeEach(() => { vi.useFakeTimers(); });
+afterEach(() => { act(() => root?.unmount()); root = undefined; vi.useRealTimers(); });
+
+function renderFallback(options: { enabled?: boolean; onPress?: () => void } = {}) {
+ const onPress = options.onPress ?? vi.fn();
+ let api: ComposerPressFallback | null = null;
+ function Probe({ enabled }: { enabled: boolean }) {
+ api = useComposerPressFallback({ enabled, onPress });
+ return null;
+ }
+ const container = document.createElement('div');
+ root = createRoot(container);
+ act(() => root!.render(createElement(Probe, { enabled: options.enabled !== false })));
+ return {
+ onPress,
+ api: () => api!,
+ rerender: (enabled: boolean) => act(() => root!.render(createElement(Probe, { enabled }))),
+ };
+}
+
+it('fires the action once when the press is released normally', () => {
+ const { onPress, api } = renderFallback();
+ act(() => {
+ api().beginPress(10, 20);
+ api().finishPress();
+ });
+ act(() => { vi.advanceTimersByTime(COMPOSER_PRESS_FALLBACK_DELAY_MS * 2); });
+ expect(onPress).not.toHaveBeenCalled();
+});
+
+it('fires the action after the grace period when the release never arrives', () => {
+ const { onPress, api } = renderFallback();
+ act(() => { api().beginPress(10, 20); });
+ expect(onPress).not.toHaveBeenCalled();
+ act(() => { vi.advanceTimersByTime(COMPOSER_PRESS_FALLBACK_DELAY_MS); });
+ expect(onPress).toHaveBeenCalledTimes(1);
+});
+
+it('does not fire after the user drags away from the button', () => {
+ const { onPress, api } = renderFallback();
+ act(() => { api().beginPress(10, 20); });
+ act(() => { api().movePress(10, 80); });
+ act(() => { vi.advanceTimersByTime(COMPOSER_PRESS_FALLBACK_DELAY_MS * 2); });
+ expect(onPress).not.toHaveBeenCalled();
+});
+
+it('keeps a small finger drift inside the tolerance', () => {
+ const { onPress, api } = renderFallback();
+ act(() => { api().beginPress(10, 20); });
+ act(() => { api().movePress(12, 24); });
+ act(() => { vi.advanceTimersByTime(COMPOSER_PRESS_FALLBACK_DELAY_MS); });
+ expect(onPress).toHaveBeenCalledTimes(1);
+});
+
+it('never fires when the fallback is disabled', () => {
+ const { onPress, api } = renderFallback({ enabled: false });
+ act(() => { api().beginPress(10, 20); });
+ act(() => { vi.advanceTimersByTime(COMPOSER_PRESS_FALLBACK_DELAY_MS * 2); });
+ expect(onPress).not.toHaveBeenCalled();
+});
+
+it('cancels the pending fallback when the control becomes disabled mid-press', () => {
+ // 按下后 300ms 内按钮因断线/忙碌被禁用:兑底不得再触发(禁用态下不应打开面板或发送)。
+ const { onPress, api, rerender } = renderFallback({ enabled: true });
+ act(() => { api().beginPress(10, 20); });
+ rerender(false);
+ act(() => { vi.advanceTimersByTime(COMPOSER_PRESS_FALLBACK_DELAY_MS * 2); });
+ expect(onPress).not.toHaveBeenCalled();
+});
+
+it('reports that the fallback already ran so the release does not fire twice', () => {
+ const { onPress, api } = renderFallback();
+ act(() => { api().beginPress(10, 20); });
+ act(() => { vi.advanceTimersByTime(COMPOSER_PRESS_FALLBACK_DELAY_MS); });
+ expect(onPress).toHaveBeenCalledTimes(1);
+ let alreadyFired = false;
+ act(() => { alreadyFired = api().finishPress(); });
+ expect(alreadyFired).toBe(true);
+ expect(onPress).toHaveBeenCalledTimes(1);
+});
+
diff --git a/apps/mobile/src/__tests__/sessionComposerDesktopFirst.test.ts b/apps/mobile/src/__tests__/sessionComposerDesktopFirst.test.ts
index d6196118ed..7036874864 100644
--- a/apps/mobile/src/__tests__/sessionComposerDesktopFirst.test.ts
+++ b/apps/mobile/src/__tests__/sessionComposerDesktopFirst.test.ts
@@ -830,6 +830,21 @@ describe('mobile session composer desktop-first surface', () => {
expect(source).not.toMatch(/(?:const|let)\s+durationMs\b/);
});
+ // 漂移撤销的接线契约:RN 0.86.3 的 Pressable 不解构 onResponderMove(落入
+ // restProps,render 时 {...eventHandlers} 在后覆盖),挂它收不到事件、12pt 漂移
+ // 兑底形同虚设(划过发送键 300ms 后误发)。movePress 必须走官方 onPressMove 通道;
+ // onResponderMove 保持原样透传(语音按钮在用)。行为层无法在本仓 node 单测覆盖
+ // (真 react-native 是 Flow 依赖链),以本接线断言锁定通道选择。
+ it('wires the composer press fallback drift guard through Pressable onPressMove', () => {
+ const source = readTextLf(resolve(process.cwd(), 'app/sessions/[sessionId].tsx'), 'utf8');
+ const button = source.slice(source.indexOf('const RouteActionButton = forwardRef'));
+ const body = button.slice(0, button.indexOf('function ComposerRuntimePill'));
+ expect(body).toContain('onPressMove={interactionDisabled ? undefined : handlePressMove}');
+ expect(body).toContain('pressFallback.movePress(event.nativeEvent.pageX, event.nativeEvent.pageY)');
+ expect(body).toContain('onResponderMove={interactionDisabled ? undefined : onResponderMove}');
+ expect(body).not.toContain('onResponderMove={interactionDisabled ? undefined : handleResponderMove}');
+ });
+
it('lets the whole top edge of the card resize without covering attachments or text', () => {
const sharedSource = readTextLf(resolve(process.cwd(), 'src/session/MobileComposerInputRow.tsx'), 'utf8');
const touchStart = sharedSource.indexOf('resizeGrabberTouch: {');
diff --git a/apps/mobile/src/session/composerPressFallback.ts b/apps/mobile/src/session/composerPressFallback.ts
new file mode 100644
index 0000000000..3fa55b1681
--- /dev/null
+++ b/apps/mobile/src/session/composerPressFallback.ts
@@ -0,0 +1,94 @@
+import { useCallback, useEffect, useRef } from 'react';
+
+/**
+ * 「按下即生效」的兜底:安卓可能在一次按压的中途把这次手势取消掉——第三方输入法
+ * 抢走输入焦点时,系统会中断 App 窗口里的这次触摸,`onPress` 于是永远不来,
+ * 按钮只闪一下就恢复原样,用户看到的是「点了没反应」(composer 卡片底排整排按钮
+ * 都会这样,输入框那行是原生 WebView、不走 RN 响应者系统,反而正常)。
+ *
+ * 因此给「点一下就做事」的控件加一条兜底:正常松手仍然立即触发(行为不变);
+ * 手势被系统取消时,宽限到期后照样触发。手指按下后明显拖动视为放弃这次点击,
+ * 不触发——否则划过按钮就会误发。
+ */
+
+/** 宽限时长:正常松手远早于它,只有手势被系统取消时才会走到兜底。 */
+export const COMPOSER_PRESS_FALLBACK_DELAY_MS = 300;
+/** 按下后允许的手指漂移(磅);超出视为放弃这次点击。 */
+export const COMPOSER_PRESS_FALLBACK_MAX_DRIFT_PT = 12;
+
+export interface ComposerPressFallback {
+ /** 按下:记录起点并排宽限定时器。 */
+ beginPress(x: number, y: number): void;
+ /** 手指移动:偏移超过容差视为放弃,取消兜底。 */
+ movePress(x: number, y: number): void;
+ /**
+ * 正常松手:取消兜底。返回 true 表示兜底已经先执行过动作,调用方不要再执行一次。
+ */
+ finishPress(): boolean;
+}
+
+export interface ComposerPressFallbackOptions {
+ /** 关掉时完全不排定时器(给有自己按压语义的控件用)。 */
+ enabled: boolean;
+ delayMs?: number;
+ maxDriftPt?: number;
+ /** 兜底触发时执行的动作。 */
+ onPress: () => void;
+}
+
+export function useComposerPressFallback(options: ComposerPressFallbackOptions): ComposerPressFallback {
+ const {
+ enabled,
+ delayMs = COMPOSER_PRESS_FALLBACK_DELAY_MS,
+ maxDriftPt = COMPOSER_PRESS_FALLBACK_MAX_DRIFT_PT,
+ onPress,
+ } = options;
+ const timerRef = useRef<ReturnType<typeof setTimeout> | null>(null);
+ const firedRef = useRef(false);
+ const originRef = useRef<{ x: number; y: number } | null>(null);
+ const onPressRef = useRef(onPress);
+ onPressRef.current = onPress;
+
+ const cancel = useCallback(() => {
+ if (timerRef.current === null) return;
+ clearTimeout(timerRef.current);
+ timerRef.current = null;
+ }, []);
+
+ useEffect(() => cancel, [cancel]);
+
+ // 按下后控件变为禁用(如断线/忙碌翻转)时,撤销待执行的兑底动作:禁用态下不应再
+ // 打开面板或发送,松手路径的 onPress 本就已被 Pressable 的 disabled 拦住。
+ useEffect(() => {
+ if (!enabled) cancel();
+ }, [cancel, enabled]);
+
+ const beginPress = useCallback((x: number, y: number) => {
+ firedRef.current = false;
+ originRef.current = { x, y };
+ cancel();
+ if (!enabled) return;
+ timerRef.current = setTimeout(() => {
+ timerRef.current = null;
+ if (firedRef.current) return;
+ firedRef.current = true;
+ onPressRef.current();
+ }, delayMs);
+ }, [cancel, delayMs, enabled]);
+
+ const movePress = useCallback((x: number, y: number) => {
+ if (timerRef.current === null) return;
+ const origin = originRef.current;
+ if (!origin) return;
+ if (Math.hypot(x - origin.x, y - origin.y) > maxDriftPt) cancel();
+ }, [cancel, maxDriftPt]);
+
+ const finishPress = useCallback(() => {
+ cancel();
+ const fired = firedRef.current;
+ firedRef.current = false;
+ return fired;
+ }, [cancel]);
+
+ return { beginPress, movePress, finishPress };
+}