From 82ee64e1ed5377ad490e2bec19a983930a93a5d0 Mon Sep 17 00:00:00 2001 From: LoopX Agent <337587101+loopx-agent@users.noreply.github.com> Date: Mon, 16 Nov 2026 11:33:19 +0800 Subject: [PATCH] Preserve keyboard focus when Goal work is reprioritized Signed-off-by: LoopX Agent <337587101+loopx-agent@users.noreply.github.com> --- .../goal-workspace-work.tsx | 35 +++++++++++++++++-- .../goal-workspace-m2.mjs | 35 +++++++++++++++++++ 2 files changed, 67 insertions(+), 3 deletions(-) diff --git a/apps/presentation/dashboard/src/features/personal-workspace/goal-workspace-work.tsx b/apps/presentation/dashboard/src/features/personal-workspace/goal-workspace-work.tsx index 794ca4ae2c..076f07ee04 100644 --- a/apps/presentation/dashboard/src/features/personal-workspace/goal-workspace-work.tsx +++ b/apps/presentation/dashboard/src/features/personal-workspace/goal-workspace-work.tsx @@ -1,6 +1,6 @@ import {ContextHelp} from "./context-help"; import {ArrowRight, ChevronDown, Circle, CircleAlert, CircleCheck, CircleHelp, Clock, Hand, Info, List, Play, Plus, Search} from "lucide-react"; -import {useEffect, useLayoutEffect, useMemo, useRef, useState, type ReactNode} from "react"; +import {Component, createRef, useEffect, useLayoutEffect, useMemo, useRef, useState, type ReactNode} from "react"; import type {GoalWorkDisplayClass, GoalWorkspaceDigest} from "../../../../../../loopx/control_plane/presentation/goal_workspace_digest.js"; import type {WorkspaceActionPreview, WorkspaceActionPreviewRequest, WorkspaceDrawerSelection, WorkspaceGoal, WorkspaceModel, WorkspaceTimelineItem} from "./personal-workspace-model"; import {localizedSessionStatus, useWorkspaceI18n} from "./i18n"; @@ -223,7 +223,7 @@ export function GoalWorkspaceWork({goal, digest, items, userTodos, selectedTodoI : null} {!readOnly ? : null} - + {visited.has("board") || lens === "board" ? : null} {visited.has("map") || lens === "map" ? : null} @@ -254,6 +254,35 @@ export function GoalWorkspaceWork({goal, digest, items, userTodos, selectedTodoI ; } +type OwnerWorkGroupsProps = {hidden: boolean; children: ReactNode}; + +class OwnerWorkGroups extends Component { + private readonly groups = createRef(); + + getSnapshotBeforeUpdate(): string | null { + const groups = this.groups.current; + const focused = groups?.ownerDocument.activeElement; + return focused instanceof HTMLButtonElement && groups?.contains(focused) + ? focused.dataset.todoId ?? null : null; + } + + componentDidUpdate(_previousProps: OwnerWorkGroupsProps, _previousState: object, todoId: string | null) { + // Crossing the summary boundary replaces the button. Restore its focus if + // the browser dropped it during this commit and the same task is still here. + const groups = this.groups.current; + if (!todoId || !groups || groups.closest("[hidden]") || groups.ownerDocument.activeElement !== groups.ownerDocument.body) return; + const row = groups.querySelector(`button[data-todo-id="${CSS.escape(todoId)}"]`); + if (!row) return; + const disclosure = row.closest("details.goal-work-more"); + if (disclosure) disclosure.open = true; + row.focus(); + } + + render() { + return ; + } +} + function RemainingWork({selectedTodoId, label, children}: {selectedTodoId: string | null; label: string; children: ReactNode}) { const disclosure = useRef(null); useEffect(() => {if (selectedTodoId && disclosure.current) disclosure.current.open = true;}, [selectedTodoId]); diff --git a/examples/personal-workspace-browser/goal-workspace-m2.mjs b/examples/personal-workspace-browser/goal-workspace-m2.mjs index ef5b6bc191..dc1ef830e9 100644 --- a/examples/personal-workspace-browser/goal-workspace-m2.mjs +++ b/examples/personal-workspace-browser/goal-workspace-m2.mjs @@ -286,6 +286,7 @@ async function runM2Pass({browser, collectCoverage, url}) { const renderBudget = {coverageEnabled:collectCoverage,initialMs,expandMs,switchMs,switchSamplesMs,...lensBudget, longTaskSupported,switchLongTasks,nodeCount:200}; console.log(JSON.stringify({m2RenderBudget:renderBudget})); + await verifyFocusAfterReprioritization(page, now, many[4]); assert.equal(writes.length,0,`Rendering created effects: ${writes}`); assert.equal(session.errors.length,0,session.errors.join('\n')); if (!collectCoverage) assert.ok(lensBudget.withinBudget, `Loaded lens switches exceeded repeated 1s target or 2s ceiling: ${JSON.stringify({switchSamplesMs,...lensBudget})}`); @@ -295,6 +296,40 @@ async function runM2Pass({browser, collectCoverage, url}) { finally {await session.close();} } +async function verifyFocusAfterReprioritization(page, now, todo) { + const byOwner = now.getByRole("button", {name:"按负责人", exact:true}); + await byOwner.click(); + const owner = now.locator('.goal-owner-group[data-owner-id="worker-0"]'); + const remaining = owner.locator(".goal-work-more"); + await remaining.locator(":scope > summary").press("Enter"); + assert.equal(await remaining.evaluate(node => node.open), false); + + const row = `[data-todo-id="${todo.todo_id}"]`; + const leading = owner.locator(`:scope > ${row}`); + const moved = remaining.locator(`${row}[data-work-class="blocked"]`); + const refresh = page.getByRole("button", {name:"刷新状态", exact:true}); + // Simulate a status refresh while the keyboard user remains on the page. + const refreshWithoutMovingFocus = () => refresh.evaluate(button => button.click()); + + await byOwner.focus(); + todo.status = "blocked"; + await refreshWithoutMovingFocus(); + await moved.waitFor({state:"attached"}); + assert.equal(await moved.isVisible(), false, "An unfocused task does not open its disclosure on refresh"); + assert.equal(await byOwner.evaluate(node => document.activeElement === node), true, "Refresh leaves focus outside the task list alone"); + + todo.status = "open"; + await refreshWithoutMovingFocus(); + await leading.focus(); + todo.status = "blocked"; + await refreshWithoutMovingFocus(); + await moved.waitFor({state:"attached"}); + assert.equal(await moved.evaluate(node => document.activeElement === node), true, "The same task keeps keyboard focus after it moves"); + await page.keyboard.press("Enter"); + await page.waitForURL(value => value.searchParams.get("todo") === todo.todo_id); + await page.locator(".personal-context-drawer").waitFor(); +} + async function verifyRemoteSelection(browser, url) { const snapshot = JSON.parse(await readFile(resolve(repoRoot,"examples/status.example.json"),"utf8"));