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): 等待安卓原生弹层关闭动画

DavidShen5bf492ee820c
diff --git a/apps/mobile/src/__tests__/newTaskSelectionAndroid.test.tsx b/apps/mobile/src/__tests__/newTaskSelectionAndroid.test.tsx
index 9d49099a3f..ec44953702 100644
--- a/apps/mobile/src/__tests__/newTaskSelectionAndroid.test.tsx
+++ b/apps/mobile/src/__tests__/newTaskSelectionAndroid.test.tsx
@@ -4,6 +4,7 @@ import { createRoot, type Root } from "react-dom/client";
import { beforeEach, afterEach, expect, it, vi } from "vitest";
const modal = vi.hoisted(() => ({ props: null as any }));
+const driveMenu = vi.hoisted(() => ({ props: null as any }));
vi.mock("react-native", () => ({
View: ({ children }: any) => <div>{children}</div>,
ActivityIndicator: () => <span>loading</span>,
@@ -46,7 +47,10 @@ vi.mock("@/session/NewTaskSelectionRow", () => ({
),
}));
vi.mock("@/platform/chrome", () => ({
- NativePullDownMenu: ({ children }: any) => children,
+ NativePullDownMenu: (p: any) => {
+ driveMenu.props = p;
+ return p.children;
+ },
NativeSwitch: () => null,
}));
vi.mock("@/session/SheetModal", () => ({
@@ -147,6 +151,16 @@ it("keeps directory Back separate from backdrop dismissal and uses remote paths"
click("remoteBrowseSelectCurrent");
expect(props.onChoose).toHaveBeenCalledWith("D:/project");
});
+it("gives the native drive menu an explicit screen-reader label", () => {
+ render({
+ page: "directory",
+ drives: [
+ { name: "C:", path: "C:/", current: true },
+ { name: "D:", path: "D:/", current: false },
+ ],
+ });
+ expect(driveMenu.props.accessibilityLabel).toBe("session.new.drive, C:");
+});
it.each([
{ loading: true },
{ busy: true },
diff --git a/apps/mobile/src/__tests__/sessionActionSheetAndroid.test.tsx b/apps/mobile/src/__tests__/sessionActionSheetAndroid.test.tsx
index 0537999b10..04df54f00f 100644
--- a/apps/mobile/src/__tests__/sessionActionSheetAndroid.test.tsx
+++ b/apps/mobile/src/__tests__/sessionActionSheetAndroid.test.tsx
@@ -68,7 +68,7 @@ beforeEach(() => {
});
vi.stubGlobal("cancelAnimationFrame", (id: number) => frames.delete(id));
(globalThis as any).IS_REACT_ACT_ENVIRONMENT = true;
- native.hide.mockReset();
+ native.hide.mockReset().mockResolvedValue();
native.expand.mockReset().mockResolvedValue();
native.mode = "light";
container = document.createElement("div");
@@ -122,7 +122,14 @@ describe.each([SessionActionSheetFrame, NativeBottomSheet])(
expect(closed).toHaveBeenCalledOnce();
});
- it("handles native swipe, scrim and Back dismissal without an extra hide animation", () => {
+ it("waits for the native swipe, scrim or Back dismissal animation", async () => {
+ let finish!: () => void;
+ native.hide.mockImplementation(
+ () =>
+ new Promise((resolve) => {
+ finish = resolve;
+ }),
+ );
const closed = vi.fn();
function Presenter() {
const [visible, setVisible] = useState(true);
@@ -138,10 +145,15 @@ describe.each([SessionActionSheetFrame, NativeBottomSheet])(
}
act(() => root.render(<Presenter />));
act(() => native.props.onDismissRequest());
- expect(container.textContent).toBe("");
+ expect(container.textContent).toContain("actions");
+ expect(native.hide).toHaveBeenCalledOnce();
+ expect(closed).not.toHaveBeenCalled();
+ await act(async () => {
+ finish();
+ });
flushFrames();
expect(closed).toHaveBeenCalledOnce();
- expect(native.hide).not.toHaveBeenCalled();
+ expect(container.textContent).toBe("");
});
it("does not let an old hide completion dismiss a newly reopened sheet", async () => {
diff --git a/apps/mobile/src/session/NativeBottomSheet.android.tsx b/apps/mobile/src/session/NativeBottomSheet.android.tsx
index c76d0c8dfe..3634cef427 100644
--- a/apps/mobile/src/session/NativeBottomSheet.android.tsx
+++ b/apps/mobile/src/session/NativeBottomSheet.android.tsx
@@ -77,7 +77,9 @@ export function NativeBottomSheet({
contentColor={colors.textPrimary}
scrimColor={colors.overlay}
onDismissRequest={() => {
- setMounted(false);
+ // The native sheet has already started its dismiss animation. Keep
+ // the host mounted until the controlled visible=false path awaits
+ // hide(), then let onClosed run after the animation completes.
onClose();
}}
>
diff --git a/apps/mobile/src/session/NewTaskSelectionSheet.android.tsx b/apps/mobile/src/session/NewTaskSelectionSheet.android.tsx
index 572551208b..723db10c08 100644
--- a/apps/mobile/src/session/NewTaskSelectionSheet.android.tsx
+++ b/apps/mobile/src/session/NewTaskSelectionSheet.android.tsx
@@ -154,6 +154,12 @@ export function NewTaskSelectionSheet(p: NewTaskSelectionSheetProps) {
/>
{p.drives.length ? (
<NativePullDownMenu
+ accessibilityLabel={[
+ t("session.new.drive"),
+ p.drives.find((drive) => drive.current)?.name,
+ ]
+ .filter(Boolean)
+ .join(", ")}
disabled={unavailable}
actions={p.drives.map((drive) => ({
id: drive.path,
diff --git a/apps/mobile/src/session/SessionActionSheetFrame.android.tsx b/apps/mobile/src/session/SessionActionSheetFrame.android.tsx
index f85efc335d..47adc7ef5e 100644
--- a/apps/mobile/src/session/SessionActionSheetFrame.android.tsx
+++ b/apps/mobile/src/session/SessionActionSheetFrame.android.tsx
@@ -75,7 +75,9 @@ export function SessionActionSheetFrame({
contentColor={colors.textPrimary}
scrimColor={colors.overlay}
onDismissRequest={() => {
- setMounted(false);
+ // The native sheet has already started its dismiss animation. Keep
+ // the host mounted until the controlled visible=false path awaits
+ // hide(), then let onClosed run after the animation completes.
onClose();
}}
>