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): restore session edge-back with passive touch tracking

Chrisd91d95a86b98
diff --git a/apps/mobile/e2e/maestro/session_back_gesture.yaml b/apps/mobile/e2e/maestro/session_back_gesture.yaml
new file mode 100644
index 0000000000..0cd50fff1e
--- /dev/null
+++ b/apps/mobile/e2e/maestro/session_back_gesture.yaml
@@ -0,0 +1,39 @@
+appId: ${APP_ID}
+---
+# Native regression: a pending Pan on the message list used to block iOS pop,
+# even with the composer collapsed. Keep the existing scroll/resize integration.
+- runFlow: login_mock_no_clear.yaml
+- extendedWaitUntil:
+ visible:
+ id: "home.sessionRowTitle.mock-session-1"
+ timeout: 15000
+- tapOn:
+ id: "home.sessionRowTitle.mock-session-1"
+- extendedWaitUntil:
+ visible:
+ id: "session.messageList"
+ timeout: 15000
+- swipe:
+ start: "1%, 50%"
+ end: "85%, 50%"
+ duration: 600
+- extendedWaitUntil:
+ visible:
+ id: "devices.list"
+ timeout: 5000
+- tapOn:
+ id: "home.sessionRowTitle.mock-session-1"
+- extendedWaitUntil:
+ visible:
+ id: "session.messageList"
+ timeout: 15000
+- tapOn:
+ id: "session.composerInputRow.collapsedOpen"
+- swipe:
+ start: "1%, 35%"
+ end: "85%, 35%"
+ duration: 600
+- extendedWaitUntil:
+ visible:
+ id: "devices.list"
+ timeout: 5000
diff --git a/apps/mobile/src/session/composerPullThrough.tsx b/apps/mobile/src/session/composerPullThrough.tsx
index 7fcbc08c74..c8b6271b4d 100644
--- a/apps/mobile/src/session/composerPullThrough.tsx
+++ b/apps/mobile/src/session/composerPullThrough.tsx
@@ -65,7 +65,7 @@ type PullThroughScrollViewProps = ScrollViewProps & {
/**
* 聊天记录列表的滚动容器(LegendList renderScrollComponent)。
*
- * 原生滚动照常进行:Native 手势只让列表加入 RNGH 编排;追踪手势 manualActivation 永不激活,
+ * 原生滚动照常进行:Native 手势只让列表加入 RNGH 编排;Manual 追踪手势永不激活,
* 只读触摸位置,不认领手势、不取消行内点击。接手时把列表滚动关掉(输入框接管这次拖动,
* 两边不同时动);抬手后恢复。追踪不依赖 Native 手势存活——关掉滚动会让原生滚动手势取消。
*/
@@ -96,8 +96,10 @@ export function ComposerPullThroughScrollView({ bridge, ref, ...props }: PullThr
}
phase.value = PHASE_IDLE;
};
- const tracker = Gesture.Pan()
- .manualActivation(true)
+ // A manual-activation Pan still installs a UIPanGestureRecognizer. iOS's
+ // interactive-pop recognizer waits for that pending pan, so even an unarmed
+ // composer blocks edge-back. Manual observes touches without a competing pan.
+ const tracker = Gesture.Manual()
.onTouchesDown((touches) => {
'worklet';
phase.value = PHASE_IDLE;