diff --git a/.scratch/acceptance-action-navigation/work.md b/.scratch/acceptance-action-navigation/work.md index d3a43707..bbd9890d 100644 --- a/.scratch/acceptance-action-navigation/work.md +++ b/.scratch/acceptance-action-navigation/work.md @@ -19,3 +19,19 @@ - 本任务验证使用 `scripts/verify-change.py` 既有 `plan_checks` 对本任务文件生成范围(`local-data/test-results/issue18/plan.json`),逐项执行并复用未变证据;不运行共享树其他任务的 Go/集群测试。未执行生产构建/发布门禁、真实客户数据写入或线上验收。 - 日志:`local-data/test-results/issue18/`;浏览器最终日志:`local-data/test-results/acceptance-playback-rate/issue18-direct-browser-run.log`,结果 `report.json`;代表图 `native-short-action-list.png`、`normal-action-list.png`、`dark-narrow-action-list.png` 及 `{loading,empty,error}-action-list.png`。 - 共享树已有其他任务改动;为避免 lint-staged 默认临时 stash 这些工作,显式运行 `npx lint-staged --no-stash`、lint:web、lint:go 等价检查,随后仅本次提交使用 HUSKY=0,不修改 hooks 配置。 + + +## #584–585 追加:动作时间轴滚动与鼠标平移 + +追加基线:0a60d803;与该提交同批本地验收,不单独上线。两段录屏已下载至主仓 `local-data/diagnostics/issue18-timeline-{1,2}.mp4`,分别约 20.8 / 6.63 秒;抽帧确认横向内容溢出,鼠标无法平移,靠页面缩放看到全量时文字过小。 + +实现范围:AcceptanceActionTimeline、review-workspace CSS、现有浏览器夹具/回归、专项 timeline-pan 回归及验证范围映射。时间比例、12px 动作字号、坐标、权限、备注/审核协议不变。动作多时显示独立“横向滚动”控件(不依赖 OS 自动隐藏的原生滚动条),鼠标左键拖动作条平移;5px 阈值区分点击/拖动,捕获指针并抑制拖动后的误点击。播放定位滑杆保持独立。触控板/横向滚轮保留;滚动控件键盘事件不穿透审查快捷键。选中动作自动滚入视口。 + +专注布局撤去裁切滚动条的 106px 上限;左栏/视频网格使用受约束的行高。完整页面密集场景夹具补齐线上固定高度容器,断言左栏内部滚动、横向控件和决定按钮都在视口内。左栏已承接短动作完整文字/时长,不增加额外缩放档位、不要求用户缩小页面。 + +专项命令 `node tests/browser/acceptance-timeline-pan.mjs` 在修改前稳定失败(mouse drag must pan overflowing actions),修改后普通/专注/只读三场景通过:30 动作、鼠标拖动不定位、单击仍定位、末条自动可见、横向滚轮和独立滚动控件不改变播放时间。原生滚动条在本机系统设置下即使设置样式仍不保留高度,故改为独立可见控件;红/绿日志保留在 `local-data/test-results/issue18/timeline-*.log`。 + +追加验证:类型/架构通过;42 项映射前端回归与 22 项 tooling 回归通过;格式/diff 检查通过。整页 native / movi / movi-fractional 三模式最终 exit 0(`append-workspace-final-verified.log`),各 15 次切片变化;密集 24 动作、滚动键不穿透、固定高度、批注/刷新、只读/失败流程通过。测试输出均在忽略目录,未访问客户写接口、未推送、未部署。 + + +追加最终证据:`local-data/test-results/issue18/append-pan-delivery.log`(30 动作、三布局/权限情形)、`append-workspace-final-verified.log`(完整三播放器)、`append-caption-delivery.log`(字幕恢复)。整页完整验证使用本机已有 Chromium 156(`chromium-1248`);本机旧 1217 安装缺失 Framework 无法启动,Edge 曾在业务断言后退出超时,未计作通过。最终截图:`local-data/test-results/acceptance-playback-rate/dense-focused-scrollbar.png`;专项截图:`local-data/test-results/acceptance-timeline-pan/`。新回归已映射到 acceptance-playback-and-feedback,后续 verify:task 可选择它。后续需用户授权后将两个本地提交同批推送并按正式发布流程准备,未执行任何上线操作。 diff --git a/docs/review-workspace-guide.zh-CN.md b/docs/review-workspace-guide.zh-CN.md index e0d604ae..dbc0b212 100644 --- a/docs/review-workspace-guide.zh-CN.md +++ b/docs/review-workspace-guide.zh-CN.md @@ -82,3 +82,6 @@ Shift + Delete(Mac:Shift + Backspace)删除列表中选中的本轮问题 最终验收的视频左侧与质检一致,按时间顺序显示当前切片的动作区间:状态、片内起止时间、时长及原动作描述。每条使用独立列表行,小于 3 秒的非无效区间显示“短区间”;这是查看标记,不会判为错误,也不会将待标注区间变成有效判断。舍弃切片保留舍弃状态,不将其列为有效动作。 点击动作行会暂停在该动作起始帧。质检、验收继续共用 `↑ / ↓` 切换动作、`Ctrl / ⌘ + ← / →` 切换切片,首尾停止;标注描述阶段已有同类导航,不新增键位。标注切片阶段的边界编辑键位保持原有规则。文字输入与弹层内不执行动作导航。 + + +动作时间轴超出视口时,下方显示独立的“横向滚动”条,可直接用鼠标拖动;在动作条上按住鼠标左键左右拖动也可平移。平移不选择动作、不移动播放位置;单击动作仍定位并暂停。点击左栏或用动作快捷键切换时,时间轴自动滚到选中的动作。触控板横向滚动继续可用,无需缩小浏览器页面;短区间的完整文字和时长仍可在左栏核对。 diff --git a/scripts/verification-scopes.json b/scripts/verification-scopes.json index ec9b66e3..6794b881 100644 --- a/scripts/verification-scopes.json +++ b/scripts/verification-scopes.json @@ -150,7 +150,9 @@ { "name": "acceptance-playback-and-feedback", "paths": [ - "^src/components/FinalAcceptanceWorkspace\\.tsx$", + "^src/components/(FinalAcceptanceWorkspace|AcceptanceActionTimeline)\\.tsx$", + "^tests/browser/acceptance-timeline-pan\\.mjs$", + "^tests/browser/fixtures/acceptance-timeline-pan\\.tsx$", "^tests/browser/acceptance-playback-rate\\.mjs$", "^tests/browser/fixtures/acceptance-playback-rate\\.tsx$", "^src/components/(ReviewCaptions|review-viewing)\\.tsx?$", @@ -168,6 +170,11 @@ ], "go": {}, "task": [ + { + "argv": ["node", "tests/browser/acceptance-timeline-pan.mjs"], + "env": {}, + "tests": true + }, { "argv": ["node", "tests/browser/acceptance-playback-rate.mjs"], "env": {}, diff --git a/src/components/AcceptanceActionTimeline.tsx b/src/components/AcceptanceActionTimeline.tsx index ddda53ba..072ad292 100644 --- a/src/components/AcceptanceActionTimeline.tsx +++ b/src/components/AcceptanceActionTimeline.tsx @@ -1,4 +1,4 @@ -import { useState } from "react"; +import { useEffect, useId, useLayoutEffect, useRef, useState } from "react"; import { cn } from "../lib/utils"; import { annotationTimelineColors as colors } from "../lib/annotation-colors.js"; @@ -34,11 +34,41 @@ export function AcceptanceActionTimeline({ const [selectedId, setSelectedId] = useState(""); const [notes, setNotes] = useState>({}); const [saved, setSaved] = useState(""); + const viewportRef = useRef(null); + const viewportId = useId(); + const [scroll, setScroll] = useState({ left: 0, max: 0 }); + const pan = useRef<{ pointerId: number; x: number; left: number; moved: boolean } | null>(null); + const suppressClick = useRef(false); + const [panning, setPanning] = useState(false); const selected = actions.find((a) => a.id === (selectedActionId ?? selectedId)) || actions.find((a) => currentTime >= a.start && currentTime < a.end) || actions[0]; + useEffect(() => { + const viewport = viewportRef.current; + const row = viewport?.querySelector("[aria-pressed='true']"); + if (!viewport || !row || pan.current?.moved) return; + const bounds = viewport.getBoundingClientRect(); + const target = row.getBoundingClientRect(); + if (target.left < bounds.left) viewport.scrollLeft += target.left - bounds.left - 8; + else if (target.right > bounds.right) viewport.scrollLeft += target.right - bounds.right + 8; + }, [selected?.id]); const span = Math.max(duration, ...actions.map((a) => a.end), 0.001); + useLayoutEffect(() => { + const viewport = viewportRef.current; + if (!viewport) return; + const sync = () => + setScroll({ left: viewport.scrollLeft, max: Math.max(0, viewport.scrollWidth - viewport.clientWidth) }); + const observer = new ResizeObserver(sync); + observer.observe(viewport); + if (viewport.firstElementChild) observer.observe(viewport.firstElementChild); + viewport.addEventListener("scroll", sync, { passive: true }); + sync(); + return () => { + observer.disconnect(); + viewport.removeEventListener("scroll", sync); + }; + }, [actions.length, span]); const update = (next: Record) => { setNotes(next); onDraftChange(Object.values(next).some((v) => v.trim())); @@ -47,7 +77,64 @@ export function AcceptanceActionTimeline({ return

暂无动作描述

; return (
-
+
{ + if (event.pointerType !== "mouse" || event.button !== 0 || (event.target as HTMLElement).closest("input")) + return; + suppressClick.current = false; + pan.current = { + pointerId: event.pointerId, + x: event.clientX, + left: event.currentTarget.scrollLeft, + moved: false, + }; + }} + onPointerMove={(event) => { + const drag = pan.current; + if (!drag || drag.pointerId !== event.pointerId) return; + if (!(event.buttons & 1)) { + pan.current = null; + setPanning(false); + return; + } + const delta = event.clientX - drag.x; + if (!drag.moved && Math.abs(delta) < 5) return; + if (!drag.moved) { + drag.moved = true; + event.currentTarget.setPointerCapture(event.pointerId); + setPanning(true); + } + event.preventDefault(); + event.currentTarget.scrollLeft = drag.left - delta; + }} + onPointerUp={() => { + suppressClick.current = Boolean(pan.current?.moved); + pan.current = null; + setPanning(false); + }} + onPointerCancel={() => { + pan.current = null; + suppressClick.current = false; + setPanning(false); + }} + onLostPointerCapture={() => { + pan.current = null; + setPanning(false); + }} + onClickCapture={(event) => { + if (!suppressClick.current || event.detail === 0) return; + suppressClick.current = false; + event.preventDefault(); + event.stopPropagation(); + }} + onDragStart={(event) => event.preventDefault()} + >
{time(0)} @@ -107,6 +194,31 @@ export function AcceptanceActionTimeline({
+ {scroll.max > 0 && ( + + )} {selected && !hideProblemEditor && (
diff --git a/src/styles/review-workspace.css b/src/styles/review-workspace.css index b1dd37cd..068fbd30 100644 --- a/src/styles/review-workspace.css +++ b/src/styles/review-workspace.css @@ -376,8 +376,8 @@ html.dark .review-focus-heading > button:hover:not(:disabled) { margin: 0; } [data-testid="final-acceptance-workspace"][data-review-focused] [data-testid="acceptance-action-timeline"] { - max-height: 106px; - overflow: hidden; + max-height: none; + overflow: visible; } [data-testid="final-acceptance-workspace"][data-review-focused] [data-testid="acceptance-action-timeline"] @@ -570,6 +570,7 @@ html.dark .review-focus-heading > button:hover:not(:disabled) { [data-testid="final-acceptance-workspace"][data-review-focused] .acceptance-player-with-actions { display: grid; grid-template-columns: 150px minmax(0, 1fr); + grid-template-rows: minmax(0, 1fr); } [data-testid="final-acceptance-workspace"][data-review-focused] .acceptance-player-with-actions > .capture-workbench { display: flex; @@ -577,6 +578,7 @@ html.dark .review-focus-heading > button:hover:not(:disabled) { min-height: 0; } [data-testid="final-acceptance-workspace"][data-review-focused] .acceptance-action-list .capture-action-list-scroll { + flex: 1; max-height: none; } @media (max-width: 700px) { @@ -584,3 +586,39 @@ html.dark .review-focus-heading > button:hover:not(:disabled) { grid-template-columns: 120px minmax(0, 1fr); } } + +/* Keep a mouse-operable scroll control visible even when the OS hides native bars. */ +.acceptance-action-viewport { + overflow-x: auto; + overflow-y: hidden; + scrollbar-width: none; + cursor: grab; + user-select: none; +} +.acceptance-action-viewport::-webkit-scrollbar { + display: none; +} +.acceptance-action-viewport[data-panning] { + cursor: grabbing; +} +.acceptance-action-viewport input { + cursor: pointer; +} +.acceptance-horizontal-scrollbar { + display: flex; + align-items: center; + gap: 8px; + margin-top: 4px !important; + padding: 0 4px 4px; + font-size: 11px; +} +.acceptance-horizontal-scrollbar > span { + flex: none; +} +.acceptance-horizontal-scrollbar input { + flex: 1; + min-width: 0; + height: 18px; + cursor: pointer; + accent-color: #64748b; +} diff --git a/tests/browser/acceptance-playback-rate.mjs b/tests/browser/acceptance-playback-rate.mjs index e22c2776..9df52bc7 100644 --- a/tests/browser/acceptance-playback-rate.mjs +++ b/tests/browser/acceptance-playback-rate.mjs @@ -168,6 +168,17 @@ try { await new Promise((resolve) => setTimeout(resolve, 1500)); if (url.pathname.includes("annotation.json") && actionMode === "error") return route.fulfill({ status: 503, json: { error: "合成动作读取失败" } }); + if (url.pathname.includes("annotation.json") && actionMode === "dense") + return route.fulfill({ + json: { + descriptions: Array.from({ length: 24 }, (_, i) => ({ + id: `dense-${i}`, + clipStartMs: (i * 8000) / 24, + clipEndMs: ((i + 1) * 8000) / 24, + description: `密集动作 ${i + 1}`, + })), + }, + }); if (url.pathname.includes("annotation.json") && actionMode === "empty") return route.fulfill({ json: { descriptions: [] } }); if (url.pathname.includes("annotation.json")) @@ -508,6 +519,36 @@ try { await actionList.getByRole("status").waitFor(); await page.screenshot({ path: `${out}/loading-action-list.png`, fullPage: true }); await brief.waitFor(); + actionMode = "dense"; + await page.goto(`${base}/__acceptance_playback_rate`); + await actionList.getByRole("option").nth(23).waitFor(); + const horizontalScroll = page.getByLabel("动作时间轴横向滚动", { exact: true }); + await horizontalScroll.waitFor(); + await actionList.getByRole("option").nth(22).click(); + await assertActionTime(22 / 3); + await page.waitForFunction( + () => document.querySelector('[data-testid="acceptance-action-viewport"]').scrollLeft > 1000, + ); + const anchor = await actionList.locator('[aria-selected="true"]').textContent(); + await horizontalScroll.focus(); + await page.keyboard.press("Home"); + await page.keyboard.press("ArrowRight"); + await page.keyboard.press("End"); + await assertActionTime(22 / 3); + assert.equal( + await actionList.locator('[aria-selected="true"]').textContent(), + anchor, + "scroll keys must not navigate review actions or frames", + ); + const scrollBox = await horizontalScroll.boundingBox(); + const footerBox = await page.locator('[data-testid="final-acceptance-workspace"] > footer').boundingBox(); + assert(scrollBox.y + scrollBox.height <= footerBox.y, "scrollbar stays above decision buttons"); + assert(scrollBox.y + scrollBox.height < 1000, "dense actions must stay inside the viewport"); + assert( + await actionList.evaluate((el) => el.scrollHeight > el.clientHeight), + "dense left list scrolls instead of expanding the video row", + ); + await page.screenshot({ path: `${out}/dense-focused-scrollbar.png`, fullPage: true }); } assert.deepEqual(errors, []); await page.screenshot({ path: `${out}/${engine}.png`, fullPage: true }); diff --git a/tests/browser/acceptance-timeline-pan.mjs b/tests/browser/acceptance-timeline-pan.mjs new file mode 100644 index 00000000..0a2850aa --- /dev/null +++ b/tests/browser/acceptance-timeline-pan.mjs @@ -0,0 +1,106 @@ +import { createServer } from "vite"; +import { chromium } from "playwright"; +import assert from "node:assert/strict"; +import fs from "node:fs/promises"; +import { browserExecutableOptions } from "../../scripts/lib/browser-executable.mjs"; +import { closeBrowserFixture } from "../../scripts/lib/browser-test-lifecycle.mjs"; +const out = "local-data/test-results/acceptance-timeline-pan"; +await fs.mkdir(out, { recursive: true }); +let server, browser, page; +const cases = []; +try { + server = await createServer({ + configFile: "tests/browser/vite.platform-feedback.config.ts", + cacheDir: `${out}/vite-cache`, + server: { host: "127.0.0.1", port: 0 }, + }); + await server.listen(); + browser = await chromium.launch({ ...browserExecutableOptions(), headless: true, args: ["--no-proxy-server"] }); + page = await browser.newPage({ viewport: { width: 1200, height: 800 } }); + page.setDefaultTimeout(5000); + const errors = []; + page.on("pageerror", (e) => errors.push(e.message)); + await page.route("**/__timeline_pan*", (route) => + route.fulfill({ + contentType: "text/html", + body: `
`, + }), + ); + for (const mode of ["normal", "focused", "focused&readonly"]) { + await page.goto(`${server.resolvedUrls.local[0]}__timeline_pan?${mode}`); + const timeline = page.getByTestId("acceptance-action-timeline"); + const viewport = timeline.locator(":scope > div").first(); + await viewport.waitFor(); + assert(await viewport.evaluate((el) => el.scrollWidth > el.clientWidth)); + const scrollbar = page.getByLabel("动作时间轴横向滚动", { exact: true }); + await scrollbar.waitFor(); + assert((await scrollbar.boundingBox()).height >= 14, "scroll control remains visible independently of OS settings"); + const viewportBox = await viewport.boundingBox(); + const timelineBox = await timeline.boundingBox(); + const scrollBox = await scrollbar.boundingBox(); + assert( + timelineBox.y + timelineBox.height >= scrollBox.y + scrollBox.height, + "focused layout must not clip the scrollbar", + ); + await page.getByRole("button", { name: /^动作 3 / }).click(); + assert.equal(await page.getByLabel("已定位时间").textContent(), "4"); + const action = page.getByRole("button", { name: /^动作 1 / }); + const box = await action.boundingBox(); + await page.mouse.move(box.x + box.width / 2, box.y + 20); + await page.mouse.down(); + await page.mouse.move(box.x + box.width / 2 - 220, box.y + 20, { steps: 8 }); + await page.mouse.up(); + assert((await viewport.evaluate((el) => el.scrollLeft)) > 100, "mouse drag must pan overflowing actions"); + assert.equal(await page.getByLabel("已定位时间").textContent(), "4", "panning must not seek or select an action"); + await page.getByRole("button", { name: /^动作 4 / }).click(); + assert.equal(await page.getByLabel("已定位时间").textContent(), "6", "ordinary clicks still seek after a drag"); + await page.getByRole("button", { name: "定位末条动作" }).click(); + await page.waitForFunction( + () => document.querySelector('[data-testid="acceptance-action-viewport"]').scrollLeft > 2000, + ); + const last = await page.getByRole("button", { name: /^动作 30 / }).boundingBox(); + assert( + last.x >= viewportBox.x && last.x + last.width <= viewportBox.x + viewportBox.width + 1, + "selected last action scrolls fully into view", + ); + await viewport.evaluate((el) => (el.scrollLeft = 0)); + await page.mouse.move(viewportBox.x + viewportBox.width / 2, viewportBox.y + 20); + await page.mouse.wheel(250, 0); + await page.waitForFunction( + () => document.querySelector('[data-testid="acceptance-action-viewport"]').scrollLeft > 100, + ); + await viewport.evaluate((el) => (el.scrollLeft = 0)); + await page.mouse.click(scrollBox.x + scrollBox.width * 0.75, scrollBox.y + scrollBox.height / 2); + await page.waitForFunction( + () => document.querySelector('[data-testid="acceptance-action-viewport"]').scrollLeft > 100, + ); + assert.equal(await page.getByLabel("已定位时间").textContent(), "58", "scrollbar and wheel never seek"); + await page.screenshot({ path: `${out}/${mode.replaceAll("&", "-")}.png`, fullPage: true }); + cases.push(mode); + } + assert.deepEqual(errors, []); + await fs.writeFile(`${out}/report.json`, JSON.stringify({ passed: true, cases }, null, 2)); + console.log(JSON.stringify({ passed: true, cases })); +} catch (error) { + await page?.screenshot({ path: `${out}/failure.png`, fullPage: true }).catch(() => {}); + console.error(error); + console.log( + await page?.evaluate(() => { + const el = document.querySelector('[data-testid="acceptance-action-viewport"]'); + return ( + el && { + height: el.offsetHeight, + client: el.clientHeight, + width: el.clientWidth, + scrollWidth: el.scrollWidth, + overflow: getComputedStyle(el).overflowX, + bar: getComputedStyle(el, "::-webkit-scrollbar").height, + scrollbarWidth: getComputedStyle(el).scrollbarWidth, + } + ); + }), + ); + throw error; +} finally { + await closeBrowserFixture({ browser, vite: server }); +} diff --git a/tests/browser/fixtures/acceptance-playback-rate.tsx b/tests/browser/fixtures/acceptance-playback-rate.tsx index 19c0e86c..fc45f425 100644 --- a/tests/browser/fixtures/acceptance-playback-rate.tsx +++ b/tests/browser/fixtures/acceptance-playback-rate.tsx @@ -85,4 +85,8 @@ function App() { /> ); } -createRoot(document.getElementById("root")!).render(); +createRoot(document.getElementById("root")!).render( +
+ +
, +); diff --git a/tests/browser/fixtures/acceptance-timeline-pan.tsx b/tests/browser/fixtures/acceptance-timeline-pan.tsx new file mode 100644 index 00000000..d3c96f9d --- /dev/null +++ b/tests/browser/fixtures/acceptance-timeline-pan.tsx @@ -0,0 +1,52 @@ +import { useState } from "react"; +import { createRoot } from "react-dom/client"; +import { AcceptanceActionTimeline } from "/src/components/AcceptanceActionTimeline"; +import "/src/index.css"; +import "/src/styles/capture-workspace.css"; +import "/src/styles/review-workspace.css"; + +const actions = Array.from({ length: 30 }, (_, index) => ({ + id: `action-${index}`, + start: index * 2, + end: (index + 1) * 2, + description: `动作 ${index + 1} 的完整原始描述`, +})); +function App() { + const [selectedActionId, select] = useState(actions[0].id); + const [currentTime, seek] = useState(0); + const query = new URLSearchParams(location.search); + return ( +
+ { + select(id); + return true; + }} + onSeek={seek} + canAct={!query.has("readonly")} + saving={false} + hideProblemEditor={query.has("focused")} + onSaveProblem={() => {}} + onDraftChange={() => {}} + /> + {currentTime} + +
+ ); +} +createRoot(document.getElementById("root")!).render();