Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。
TypeScript agentai-agentai-assistantandroidclaude-codecodexelectroniosllmmacosreact-nativetypescriptwindows
fix(mobile): 保存中禁用标签编辑页的原生返回键
kirozengc8cbe04ed5b1
diff --git a/apps/mobile/src/__tests__/taskTagsRecovery.test.tsx b/apps/mobile/src/__tests__/taskTagsRecovery.test.tsxindex 236c5132fe..ca9c600f43 100644--- a/apps/mobile/src/__tests__/taskTagsRecovery.test.tsx+++ b/apps/mobile/src/__tests__/taskTagsRecovery.test.tsx@@ -432,3 +432,42 @@ it("drives native tag pages from the shared expanded state", async () => {expect(onExpandedChange).toHaveBeenCalledWith(false);expect(pages).toEqual(["list", "edit", "list", "add", "list"]);});++it("reports the native back arrow as disabled while a form save is in flight", async () => {+ let finish!: (value: any) => void;+ const pages: [string | null, boolean][] = [];+ let back = () => {};+ let state: any;+ await act(async () =>+ root.render(+ <TaskTagsPanel+ session={session}+ expanded+ onExpandedChange={onExpandedChange}+ renderExpanded={(value) => {+ state = value;+ return null;+ }}+ onPageChange={(page, goBack, backDisabled) => {+ pages.push([page, backDisabled]);+ back = goBack;+ }}+ />,+ ),+ );+ await act(async () => state.onAdd());+ await act(async () => state.form.onNameChange("Ideas"));+ h.invoke.mockImplementationOnce(+ () =>+ new Promise((resolve) => {+ finish = resolve;+ }),+ );+ await act(async () => state.form.onSubmit());+ // The save is pending: the header must say so, and tapping back must not slip through.+ expect(pages.at(-1)).toEqual(["add", true]);+ await act(async () => back());+ expect(state.page).toBe("add");+ await act(async () => finish({ tags: [], sessions: [] }));+ expect(pages.at(-1)![1]).toBe(false);+});diff --git a/apps/mobile/src/__tests__/taskTagsSheet.test.tsx b/apps/mobile/src/__tests__/taskTagsSheet.test.tsxindex 28fab33e6b..0db4e8b158 100644--- a/apps/mobile/src/__tests__/taskTagsSheet.test.tsx+++ b/apps/mobile/src/__tests__/taskTagsSheet.test.tsx@@ -5,7 +5,7 @@ import { afterEach, beforeEach, expect, it, vi } from 'vitest';const h = vi.hoisted(() => ({sheet: null as any,- pageChange: null as null | ((page: string | null, back: () => void) => void),+ pageChange: null as null | ((page: string | null, back: () => void, backDisabled?: boolean) => void),}));vi.mock('react-native', () => ({@@ -71,3 +71,22 @@ it('lets the list close the sheet and the editor pages step back inside it', asyexpect(back).toHaveBeenCalledTimes(1);expect(onClose).not.toHaveBeenCalled();});++it('passes a saving editor page down so the back arrow is disabled', async () => {+ await act(async () =>+ root.render(+ <TaskTagsSheet+ session={{ id: 's', canonicalDeviceId: 'host' } as any}+ visible+ onClose={() => {}}+ onClosed={() => {}}+ />,+ ),+ );+ expect(h.sheet.backDisabled).toBe(false);+ await act(async () => h.pageChange!('edit', () => {}, true));+ expect(h.sheet.backDisabled).toBe(true);+ // The list can always close the sheet, even while a request is in flight.+ await act(async () => h.pageChange!('list', () => {}, true));+ expect(h.sheet.backDisabled).toBe(false);+});diff --git a/apps/mobile/src/session/ComposerSheet.ios.tsx b/apps/mobile/src/session/ComposerSheet.ios.tsxindex 4cdc4716c8..2b9660b699 100644--- a/apps/mobile/src/session/ComposerSheet.ios.tsx+++ b/apps/mobile/src/session/ComposerSheet.ios.tsx@@ -49,6 +49,7 @@ export function ComposerSheet({onClosed,title,onBack,+ backDisabled = false,backLabel,children,aboveContent,@@ -100,7 +101,7 @@ export function ComposerSheet({]}>{onBack ? (- <Button onPress={onBack} modifiers={[buttonStyle("plain"), accessibilityLabel(backLabel ?? t("interaction.contextSheet.backAccessibility"))]}>+ <Button onPress={onBack} modifiers={[buttonStyle("plain"), disabled(backDisabled), accessibilityLabel(backLabel ?? t("interaction.contextSheet.backAccessibility"))]}><Image size={iconSize.lg} systemName="chevron.left" modifiers={[frame({ width: 44, height: 44 }), contentShape(shapes.rectangle())]} /></Button>) : null}diff --git a/apps/mobile/src/session/ComposerSheet.tsx b/apps/mobile/src/session/ComposerSheet.tsxindex 0dc2c3068d..462b3e5fc9 100644--- a/apps/mobile/src/session/ComposerSheet.tsx+++ b/apps/mobile/src/session/ComposerSheet.tsx@@ -15,6 +15,8 @@ export interface ComposerSheetProps {onClosed?(): void;title: string;onBack?(): void;+ /** Dim the back arrow while its action would be ignored (for example a save in flight). */+ backDisabled?: boolean;backLabel?: string;children: ReactNode;aboveContent?: ReactNode;diff --git a/apps/mobile/src/session/SessionOptionsExpoSheet.tsx b/apps/mobile/src/session/SessionOptionsExpoSheet.tsxindex c256166736..742136ee93 100644--- a/apps/mobile/src/session/SessionOptionsExpoSheet.tsx+++ b/apps/mobile/src/session/SessionOptionsExpoSheet.tsx@@ -154,6 +154,7 @@ function SessionOptionsExpoSheet({// The row the user swiped already names the task; only tag pages need a title.title={page ? taskTagsPageTitle(page, t) : ''}onBack={page ? tagPage.back : undefined}+ backDisabled={page ? tagPage.backDisabled : false}backLabel={t('taskTags.back')}onClose={onClose}onClosed={onClosed}diff --git a/apps/mobile/src/session/TaskTags.tsx b/apps/mobile/src/session/TaskTags.tsxindex 073abb4885..93d50b29c0 100644--- a/apps/mobile/src/session/TaskTags.tsx+++ b/apps/mobile/src/session/TaskTags.tsx@@ -351,7 +351,7 @@ export function TaskTagsPanel({renderCompact?: (state: TaskTagsCompactState) => ReactNode;renderExpanded?: (state: TaskTagsExpandedState) => ReactNode;/** Reports the expanded page so a native sheet header can title it and go back. */- onPageChange?: (page: TaskTagsPage | null, back: () => void) => void;+ onPageChange?: (page: TaskTagsPage | null, back: () => void, backDisabled: boolean) => void;showDone?: boolean;}) {const { colors } = useTheme();@@ -835,12 +835,14 @@ export function TaskTagsPanel({backRef.current = back;const stableBack = useCallback(() => backRef.current(), []);const reportedPage = expanded ? page : null;+ // Back is a no-op while the form is saving; the header must show that, not just ignore taps.+ const backDisabled = reportedPage !== null && formOpen && !deletion && busy;const pageListener = useRef(onPageChange);pageListener.current = onPageChange;useEffect(() => {- pageListener.current?.(reportedPage, stableBack);- }, [reportedPage, stableBack]);- useEffect(() => () => pageListener.current?.(null, stableBack), [stableBack]);+ pageListener.current?.(reportedPage, stableBack, backDisabled);+ }, [reportedPage, stableBack, backDisabled]);+ useEffect(() => () => pageListener.current?.(null, stableBack, false), [stableBack]);const swatch = (tag: TaskTag): TaskTagSwatchState => ({id: tag.id,name: tagName(tag, t),diff --git a/apps/mobile/src/session/TaskTagsSheet.tsx b/apps/mobile/src/session/TaskTagsSheet.tsxindex 9717f90bbb..799c67f34d 100644--- a/apps/mobile/src/session/TaskTagsSheet.tsx+++ b/apps/mobile/src/session/TaskTagsSheet.tsx@@ -73,6 +73,7 @@ export function TaskTagsSheet({// This sheet opens from task details, so the list's back arrow closes it and lets// the parent reopen; the editor pages step back within the sheet.onBack={page === 'list' ? onClose : tagPage.back}+ backDisabled={page === 'list' ? false : tagPage.backDisabled}backLabel={t('taskTags.back')}onClose={onClose}onClosed={onClosed}diff --git a/apps/mobile/src/session/taskTagsNativePage.ts b/apps/mobile/src/session/taskTagsNativePage.tsindex d8ce9464b8..b8e0ecd786 100644--- a/apps/mobile/src/session/taskTagsNativePage.ts+++ b/apps/mobile/src/session/taskTagsNativePage.ts@@ -7,13 +7,18 @@ export const TAG_SWATCH = { row: 22, picker: 28 } as const;/** Header state for a native sheet hosting the expanded tag pages. */export function useTaskTagsNativePage() {const [page, setPage] = useState<TaskTagsPage | null>(null);+ const [backDisabled, setBackDisabled] = useState(false);const backRef = useRef<() => void>(() => {});- const onPageChange = useCallback((next: TaskTagsPage | null, back: () => void) => {- backRef.current = back;- setPage(next);- }, []);+ const onPageChange = useCallback(+ (next: TaskTagsPage | null, back: () => void, blocked = false) => {+ backRef.current = back;+ setPage(next);+ setBackDisabled(blocked);+ },+ [],+ );const back = useCallback(() => backRef.current(), []);- return { page, back, onPageChange };+ return { page, back, backDisabled, onPageChange };}export function taskTagsPageTitle(page: TaskTagsPage, t: (key: string) => string) {