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): 修复横屏任务侧栏显示设置菜单

Dash97f21d38758d
diff --git a/apps/mobile/src/__tests__/nativeGlassControls.test.tsx b/apps/mobile/src/__tests__/nativeGlassControls.test.tsx
index 95f6e93441..f9d599bef9 100644
--- a/apps/mobile/src/__tests__/nativeGlassControls.test.tsx
+++ b/apps/mobile/src/__tests__/nativeGlassControls.test.tsx
@@ -9,6 +9,8 @@ import { useNativeGlassButtonStyle } from "../platform/chrome/nativeGlassButtonS
import { NewTaskSelectionSheet } from "../session/NewTaskSelectionSheet.ios";
import { ContextSheetFooterButton, ContextSheetRow } from "../session/ContextSheet.ios";
import { PermissionGuideView } from "../remote-desktop/PermissionGuideView.ios";
+import { HomeDisplayMenu } from "../session/HomeDisplayMenu.ios";
+import { buildHomeDisplayPullDownActions, homeDisplayActionPatch, type HomeDisplayMenuState } from "../session/homeChromeMenus";
import type { NewTaskSelectionSheetProps } from "../session/NewTaskSelectionSheet";
const state = vi.hoisted(() => ({ glass: true, mode: "light" }));
@@ -41,6 +43,19 @@ vi.mock("@/theme", () => ({
vi.mock("@/session/useLiquidGlassAvailable", () => ({
useLiquidGlassAvailable: () => state.glass,
}));
+vi.mock("@/platform/chrome/useNativeMenuReminderImage", () => ({
+ useNativeMenuReminderImage: () => '/cache/reminder.png',
+}));
+// Display settings do not use device scope navigation or remote collections.
+vi.mock("@/session/mobileHome", () => ({ canBrowseMobileHomeDevice: () => true }));
+vi.mock("@/device-link/remoteResources", () => ({ serializeRemoteResourceTargets: vi.fn() }));
+// MenuView 2.0 Fabric's SubAction has no subactions: inline sections consume
+// its only child level. Model that native boundary for the pre-fix regression.
+vi.mock("@/platform/chrome/NativePullDownMenu", () => ({
+ NativePullDownMenu: ({ actions, onAction }: any) => actions.flatMap((section: any) =>
+ (section.subactions ?? [section]).map((action: any) =>
+ <button key={action.id} data-testid={`home.displayMenu.${action.id}`} onClick={() => onAction(action.id)}>{action.title}</button>)),
+}));
vi.mock("react-i18next", () => ({
useTranslation: () => ({ t: (key: string) => key }),
}));
@@ -86,7 +101,13 @@ vi.mock("@expo/ui/swift-ui", () => {
RNHostView: Container,
Text: ({ children, modifiers }: any) => <span data-text-style={JSON.stringify(modifiers)}>{children}</span>,
Picker: Container,
- Toggle: () => null,
+ Toggle: ({ children, isOn, onIsOnChange, testID, modifiers = [] }: any) => (
+ <button data-testid={testID} aria-checked={isOn} data-button-style={JSON.stringify(modifiers)}
+ disabled={modifiers.some((m: any) => m.name === "disabled" && m.value)}
+ onClick={() => onIsOnChange(!isOn)}>{children}</button>
+ ),
+ Menu: ({ children, label, testID }: any) => <div data-testid={testID}>{label}{children}</div>,
+ Section: Container,
Divider: () => null,
LabeledContent: Container,
Image: () => null,
@@ -130,6 +151,10 @@ vi.mock("@expo/ui/swift-ui/modifiers", () => {
"fixedSize",
"multilineTextAlignment",
"padding",
+ "menuStyle",
+ "menuIndicator",
+ "menuOrder",
+ "menuActionDismissBehavior",
];
return {
...Object.fromEntries(
@@ -153,6 +178,45 @@ function mount(children: ReactNode) {
return host;
}
+// Unit: Duo's sidebar display settings must deliver deep leaf IDs to the real
+// preference reducer. Existing menu-model tests never cross the native presenter.
+// Minimum failure: inline section → submenu → leaf (MenuView Fabric drops leaf).
+it.each(["light", "dark"])("applies nested sidebar display choices in %s", (mode) => {
+ state.mode = mode;
+ const changed = vi.fn();
+ function DisplayMenu() {
+ const [settings, setSettings] = useState<HomeDisplayMenuState>({
+ groupByProject: true, groupDialogue: false, sortBy: 'priority', projectOrder: 'activity',
+ statusFilter: 'active', projectFilter: 'all', vendorFilter: 'all', lastActivityFilter: 'all',
+ viewMode: 'text', taskInfoFields: [],
+ });
+ const actions = buildHomeDisplayPullDownActions({ state: settings,
+ projects: [{ key: 'project-a', title: 'Project A', count: 1 }], dialogueCount: 0, t: key => key });
+ return <HomeDisplayMenu actions={actions} accessibilityLabel="Display settings" onAction={id => {
+ const patch = homeDisplayActionPatch(id, settings);
+ changed(patch);
+ if (patch) setSettings(current => ({ ...current, ...patch }));
+ }}><span>More</span></HomeDisplayMenu>;
+ }
+ const host = mount(<DisplayMenu />);
+ const option = (id: string) => host.querySelector(`[data-testid="home.displayMenu.${id}"]`) as HTMLButtonElement;
+ expect(option('status.archived')).not.toBeNull();
+ act(() => option('status.archived').click());
+ expect(changed).toHaveBeenLastCalledWith({ statusFilter: 'archived' });
+ expect(option('status.archived').getAttribute('aria-checked')).toBe('true');
+ expect(option('status.active').getAttribute('aria-checked')).toBe('false');
+ act(() => option('filter.project:project-a').click());
+ expect(changed).toHaveBeenLastCalledWith({ projectFilter: ['project-a'] });
+ expect(option('filter.project:project-a').getAttribute('aria-checked')).toBe('true');
+ expect(JSON.parse(option('filter.project:project-a').getAttribute('data-button-style')!))
+ .toContainEqual({ name: 'menuActionDismissBehavior', value: 'disabled' });
+ act(() => option('filter.reset').click());
+ expect(changed).toHaveBeenLastCalledWith(expect.objectContaining({ projectFilter: 'all' }));
+ expect(option('filter.reset').disabled).toBe(true);
+ act(() => option('filter.reset').click());
+ expect(changed).toHaveBeenCalledTimes(3);
+});
+
it.each(["light", "dark"])("keeps the context row label and hit area while toggling a sized trailing icon in %s", (mode) => {
state.mode = mode;
const onPress = vi.fn();
diff --git a/apps/mobile/src/session/HomeDisplayMenu.ios.tsx b/apps/mobile/src/session/HomeDisplayMenu.ios.tsx
new file mode 100644
index 0000000000..c4e0fce787
--- /dev/null
+++ b/apps/mobile/src/session/HomeDisplayMenu.ios.tsx
@@ -0,0 +1,160 @@
+import { Host } from "@expo/ui";
+import {
+ Button,
+ Image,
+ Label,
+ Menu,
+ RNHostView,
+ Section,
+ Text,
+ Toggle,
+} from "@expo/ui/swift-ui";
+import {
+ accessibilityLabel,
+ disabled,
+ menuActionDismissBehavior,
+ menuIndicator,
+ menuOrder,
+ menuStyle,
+} from "@expo/ui/swift-ui/modifiers";
+import type { ComponentProps, ReactNode } from "react";
+import { View } from "react-native";
+import type { NativePullDownAction } from "@/platform/chrome/NativePullDownMenu";
+import { useNativeMenuReminderImage } from "@/platform/chrome/useNativeMenuReminderImage";
+import { useNativeGlassButtonStyle } from "@/platform/chrome/nativeGlassButtonStyle.ios";
+import { iconSize, navigationChrome, useTheme } from "@/theme";
+import type { HomeDisplayMenuProps } from "./HomeDisplayMenu";
+
+/** Sidebar-local native menu. MenuView's Fabric bridge only transports one
+ * child level; the home model includes inline sections and deeper filters.
+ * SwiftUI preserves that tree without changing the native toolbar or model. */
+export function HomeDisplayMenu(props: HomeDisplayMenuProps) {
+ const { colors, mode } = useTheme();
+ const reminderImage = useNativeMenuReminderImage(true);
+ const size = navigationChrome.target;
+ const glassStyle = useNativeGlassButtonStyle({ shape: "circle" });
+ return (
+ <Host
+ colorScheme={mode}
+ seedColor={colors.textPrimary}
+ ignoreSafeArea="all"
+ style={{ width: size, height: size }}
+ >
+ <Menu
+ testID="home.displaySettingsButton"
+ label={
+ <RNHostView matchContents>
+ {/* Only artwork in the label: Menu owns the glass and activation. */}
+ <View
+ pointerEvents="none"
+ accessibilityElementsHidden
+ collapsable={false}
+ style={{
+ width: iconSize.action,
+ height: iconSize.action,
+ alignItems: "center",
+ justifyContent: "center",
+ }}
+ >
+ {props.children}
+ </View>
+ </RNHostView>
+ }
+ modifiers={[
+ menuStyle("button"),
+ menuIndicator("hidden"),
+ ...glassStyle,
+ menuOrder("fixed"),
+ accessibilityLabel(props.accessibilityLabel),
+ ]}
+ >
+ {menuItems(props.actions, props.onAction, reminderImage)}
+ </Menu>
+ </Host>
+ );
+}
+
+function menuItems(
+ actions: readonly NativePullDownAction[],
+ onAction: (id: string) => void,
+ reminderImage: string | undefined,
+): ReactNode {
+ return actions.map((action) => {
+ const modifiers: NonNullable<ComponentProps<typeof Button>["modifiers"]> = [
+ disabled(!!action.disabled),
+ ];
+ const testID = `home.displayMenu.${action.id}`;
+ const label = (
+ <Label
+ title={action.title}
+ icon={
+ action.filterReminder && reminderImage ? (
+ <Image uiImage={`file://${encodeURI(reminderImage)}`} />
+ ) : action.image ? (
+ <Image
+ systemName={
+ action.image as ComponentProps<typeof Image>["systemName"]
+ }
+ />
+ ) : undefined
+ }
+ />
+ );
+ if (action.subactions?.length) {
+ const children = menuItems(action.subactions, onAction, reminderImage);
+ return action.displayInline ? (
+ <Section
+ key={action.id}
+ title={action.title || undefined}
+ modifiers={modifiers}
+ >
+ {children}
+ </Section>
+ ) : (
+ <Menu
+ key={action.id}
+ label={label}
+ modifiers={modifiers}
+ testID={testID}
+ >
+ {children}
+ </Menu>
+ );
+ }
+ modifiers.push(
+ menuActionDismissBehavior(action.keepPresented ? "disabled" : "enabled"),
+ );
+ const select = () => {
+ if (!action.disabled) onAction(action.id);
+ };
+ // Native Toggle supplies the menu checkmark; keep the action model as the
+ // source of truth after selection (radio choices and multi-select alike).
+ const content = (
+ <>
+ {label}
+ {action.subtitle ? <Text>{action.subtitle}</Text> : null}
+ </>
+ );
+ return action.state !== undefined ? (
+ <Toggle
+ key={action.id}
+ isOn={action.state === "on"}
+ onIsOnChange={select}
+ modifiers={modifiers}
+ testID={testID}
+ >
+ {content}
+ </Toggle>
+ ) : (
+ <Button
+ key={action.id}
+ onPress={select}
+ role={action.destructive ? "destructive" : undefined}
+ modifiers={modifiers}
+ testID={testID}
+ >
+ {content}
+ </Button>
+ );
+ });
+}
diff --git a/apps/mobile/src/session/HomeDisplayMenu.tsx b/apps/mobile/src/session/HomeDisplayMenu.tsx
new file mode 100644
index 0000000000..2a9ca18099
--- /dev/null
+++ b/apps/mobile/src/session/HomeDisplayMenu.tsx
@@ -0,0 +1,33 @@
+import type { ReactNode } from "react";
+import { AnchoredPullDownMenu } from "@/platform/chrome/AnchoredPullDownMenu";
+import {
+ NativePullDownMenu,
+ usesNativePullDownMenu,
+ type NativePullDownAction,
+} from "@/platform/chrome/NativePullDownMenu";
+import { HomeHeaderGlassButton } from "./HomeHeaderGlassButton";
+
+export interface HomeDisplayMenuProps {
+ actions: readonly NativePullDownAction[];
+ children: ReactNode;
+ accessibilityLabel: string;
+ onAction(id: string): void;
+}
+
+/** Non-iOS keeps the existing anchored menu and the shared action model. */
+export function HomeDisplayMenu(props: HomeDisplayMenuProps) {
+ const children = (
+ <HomeHeaderGlassButton
+ accessibilityLabel={props.accessibilityLabel}
+ onPress={() => undefined}
+ testID="home.displaySettingsButton"
+ >
+ {props.children}
+ </HomeHeaderGlassButton>
+ );
+ return usesNativePullDownMenu() ? (
+ <NativePullDownMenu {...props}>{children}</NativePullDownMenu>
+ ) : (
+ <AnchoredPullDownMenu {...props}>{children}</AnchoredPullDownMenu>
+ );
+}
diff --git a/apps/mobile/src/session/HomeSurface.tsx b/apps/mobile/src/session/HomeSurface.tsx
index 48f41083b2..4e73a18f85 100644
--- a/apps/mobile/src/session/HomeSurface.tsx
+++ b/apps/mobile/src/session/HomeSurface.tsx
@@ -114,7 +114,7 @@ import {
openHomeRemoteCollection,
} from '@/session/homeChromeMenus';
import { useConversationSearchFilterMenu } from '@/session/useConversationSearchFilterMenu';
-import { AnchoredPullDownMenu } from '@/platform/chrome/AnchoredPullDownMenu';
+import { HomeDisplayMenu } from '@/session/HomeDisplayMenu';
import type { NativePullDownAction } from '@/platform/chrome/NativePullDownMenu';
import {
activeContentFilterCount,
@@ -3340,15 +3340,13 @@ function HomeScreenContent({ active = true, width, newSessionInSystemBar = false
<Monitor color={colors.textPrimary} size={iconSize.action} strokeWidth={iconStroke.regular} />
</HomeHeaderGlassButton>
) : null}
- {/* 系统菜单不可用(未编进 MenuView 的旧 iOS 包)时退回同一份菜单模型的 Cindy 自绘菜单。 */}
- <HomeDisplayMenu actions={homeDisplayPullDownActions} onAction={handleDisplayAction}>
- <HomeHeaderGlassButton accessibilityLabel={displayA11y} onPress={() => undefined} testID="home.displaySettingsButton">
- <View>
- <Ellipsis color={colors.textPrimary} size={iconSize.action} strokeWidth={iconStroke.regular} />
- {/* 在看已归档任务时标一个点,提醒列表不是平常的进行中任务。 */}
- {archivedReminder ? <FilterReminderDot offset={styles.displayFilterDotOffset} testID="home.displayFilterDot" /> : null}
- </View>
- </HomeHeaderGlassButton>
+ {/* 侧栏本地菜单完整保留分组和多层筛选;系统顶栏继续使用自己的原生菜单。 */}
+ <HomeDisplayMenu actions={homeDisplayPullDownActions} onAction={handleDisplayAction} accessibilityLabel={displayA11y}>
+ <View>
+ <Ellipsis color={colors.textPrimary} size={iconSize.action} strokeWidth={iconStroke.regular} />
+ {/* 在看已归档任务时标一个点,提醒列表不是平常的进行中任务。 */}
+ {archivedReminder ? <FilterReminderDot offset={styles.displayFilterDotOffset} testID="home.displayFilterDot" /> : null}
+ </View>
</HomeDisplayMenu>
</View>
)}
@@ -4902,26 +4900,6 @@ function pullDownActionsEqual(a: readonly NativePullDownAction[], b: readonly Na
return a === b || JSON.stringify(a) === JSON.stringify(b);
}
-/**
- * 显示菜单触发器:系统菜单可用时走 UIMenu / 安卓下拉;未编进 MenuView 的旧 iOS 包退回
- * 同一份菜单模型的 Cindy 自绘菜单,两条路径的选项与层级完全一致。
- */
-function HomeDisplayMenu({
- actions,
- children,
- onAction,
-}: {
- actions: readonly NativePullDownAction[];
- children: ReactNode;
- onAction(id: string): void;
-}) {
- return usesNativePullDownMenu() ? (
- <NativePullDownMenu actions={actions} onAction={onAction}>{children}</NativePullDownMenu>
- ) : (
- <AnchoredPullDownMenu actions={actions} onAction={onAction}>{children}</AnchoredPullDownMenu>
- );
-}
-
/** 该首页行是否以「块」呈现(上下全宽线):项目组,或自动化组行(顶层 asBlock)。 */
function isBlockHomeRow(row: HomeRow | undefined): boolean {
if (!row) return false;