fix(project): restore smooth quarter toggles
Hide monthly content until column widths settle to prevent numeric shifts during expansion.
This commit is contained in:
@@ -43,9 +43,16 @@ const server = http.createServer(function (req, res) {
|
||||
try {
|
||||
await new Promise(function (resolve) { server.listen(0, "127.0.0.1", resolve); });
|
||||
browser = await chromium.launch({ headless: true, executablePath: process.env.PJ_TEST_BROWSER || undefined });
|
||||
// 접기/펼치기 첫 화면부터 숫자 위치·저장 너비가 안정적이어야 한다(관리자·보기 전용·75% 배율).
|
||||
// 열 너비는 애니메이션하고, 숫자는 최종 위치에서만 표시한다(관리자·보기 전용·75% 배율).
|
||||
for (const readonly of [false, true]) {
|
||||
const folding = await browser.newPage({ viewport: { width: 1600, height: 1000 } });
|
||||
await folding.addInitScript(() => document.addEventListener("DOMContentLoaded", () => {
|
||||
const row = document.querySelector('tr[data-row-id="10"]');
|
||||
const cell = row.querySelector('td[data-month="1"]');
|
||||
cell.colSpan = 2; cell.dataset.span = "2"; cell.classList.add("is-merged");
|
||||
cell.querySelector("div").textContent = "병합한 목표\n두 번째 줄\n세 번째 줄";
|
||||
row.querySelector('td[data-month="2"]').remove();
|
||||
}));
|
||||
await folding.goto("http://127.0.0.1:" + server.address().port + "/project/goals/2026" + (readonly ? "?readonly" : ""));
|
||||
await folding.evaluate(() => localStorage.setItem("pj_goal_col_w", JSON.stringify({ m1: 150, m2: 110, m3: 175 })));
|
||||
await folding.reload();
|
||||
@@ -56,6 +63,9 @@ const server = http.createServer(function (req, res) {
|
||||
const table = document.getElementById("pj-goal-table");
|
||||
const q = table.querySelector('thead th[data-col="q1"]');
|
||||
const cells = Array.from(table.querySelectorAll('.pj-goal-kpi .pj-goal-m[data-h="1"]'));
|
||||
const merged = table.querySelector('tr[data-row-id="10"] td[data-month="1"]');
|
||||
const mergedHeight = merged.parentElement.getBoundingClientRect().height;
|
||||
const mergedWidth = merged.getBoundingClientRect().width;
|
||||
function snapshot() {
|
||||
return cells.map(c => {
|
||||
const box = c.getBoundingClientRect();
|
||||
@@ -65,32 +75,68 @@ const server = http.createServer(function (req, res) {
|
||||
return [box.x, box.width, content.x, content.width];
|
||||
});
|
||||
}
|
||||
const delay = ms => new Promise(resolve => setTimeout(resolve, ms));
|
||||
async function frames() {
|
||||
const out = [];
|
||||
let heightStable = true;
|
||||
const started = performance.now();
|
||||
while (performance.now() - started < 420) {
|
||||
await new Promise(requestAnimationFrame);
|
||||
out.push(cells.map(c => ({ width: c.getBoundingClientRect().width,
|
||||
folding: c.classList.contains("is-folding"),
|
||||
hidden: c.querySelector(".pj-goal-num") ? getComputedStyle(c.querySelector(".pj-goal-num")).opacity === "0" : getComputedStyle(c).color === "rgba(0, 0, 0, 0)" })));
|
||||
if (merged.classList.contains("is-folding")) {
|
||||
heightStable = heightStable && Math.abs(merged.parentElement.getBoundingClientRect().height - mergedHeight) < 1;
|
||||
}
|
||||
}
|
||||
assertHeightStable = assertHeightStable && heightStable;
|
||||
return out;
|
||||
}
|
||||
let assertHeightStable = true;
|
||||
const before = snapshot();
|
||||
q.click();
|
||||
const hiddenImmediately = cells.every(c => getComputedStyle(c).display === "none");
|
||||
const closing = await frames();
|
||||
await delay(100);
|
||||
const hiddenAfterClose = cells.every(c => getComputedStyle(c).display === "none");
|
||||
q.click();
|
||||
const frames = [snapshot()];
|
||||
for (let i = 0; i < 6; i++) {
|
||||
await new Promise(requestAnimationFrame); frames.push(snapshot());
|
||||
}
|
||||
// 기존 애니메이션 종료 시점에도 폭·숫자 위치가 바뀌지 않아야 한다.
|
||||
await new Promise(resolve => setTimeout(resolve, 400)); frames.push(snapshot());
|
||||
q.click(); q.click(); q.click();
|
||||
const opening = await frames();
|
||||
await delay(150);
|
||||
const after = snapshot();
|
||||
// 여러 분기 동시 전환과 빠른 반전: 마지막 클릭 상태만 남는다.
|
||||
const q2 = table.querySelector('thead th[data-col="q2"]');
|
||||
q.click(); q2.click(); await delay(70); q.click(); await delay(50); q.click();
|
||||
await delay(400);
|
||||
const rapidHidden = cells.every(c => getComputedStyle(c).display === "none");
|
||||
const otherHidden = Array.from(table.querySelectorAll('.pj-goal-m[data-h="2"]')).every(c => getComputedStyle(c).display === "none");
|
||||
const savedFold = JSON.parse(localStorage.getItem("pj_goal_fold_q"))[1];
|
||||
q.click();
|
||||
return { before, frames, hiddenImmediately, rapidHidden, savedFold,
|
||||
q.click(); q2.click(); await delay(500);
|
||||
return { before, after, closing, opening, hiddenAfterClose, rapidHidden, otherHidden, savedFold,
|
||||
mergedStable: assertHeightStable && Math.abs(merged.getBoundingClientRect().width - mergedWidth) < 0.1 && merged.colSpan === 2,
|
||||
clean: !table.querySelector(".is-folding"),
|
||||
widths: ["m1", "m2", "m3"].map(key => table.querySelector('thead th[data-col="' + key + '"]').getBoundingClientRect().width / zoom) };
|
||||
}, zoom);
|
||||
assert(result.hiddenImmediately && result.rapidHidden && result.savedFold, JSON.stringify(result));
|
||||
result.frames.forEach(frame => frame.forEach((cell, i) => cell.forEach((value, j) => {
|
||||
assert(result.hiddenAfterClose && result.rapidHidden && result.otherHidden && result.savedFold && result.clean && result.mergedStable,
|
||||
JSON.stringify({ hiddenAfterClose: result.hiddenAfterClose, rapidHidden: result.rapidHidden, otherHidden: result.otherHidden, savedFold: result.savedFold, clean: result.clean, mergedStable: result.mergedStable }));
|
||||
for (const frames of [result.closing, result.opening]) {
|
||||
assert(frames.some(frame => frame[0].width > 1 && frame[0].width < result.before[0][1] - 1), "quarter width must visibly animate");
|
||||
frames.forEach(frame => frame.forEach(cell => assert(!cell.folding || cell.hidden, "moving numeric content must stay hidden")));
|
||||
}
|
||||
result.after.forEach((cell, i) => cell.forEach((value, j) => {
|
||||
assert(Math.abs(value - result.before[i][j]) < 0.1, "quarter numeric position changed during reveal");
|
||||
})));
|
||||
}));
|
||||
result.widths.forEach((width, i) => assert(Math.abs(width - [150, 110, 175][i]) < 1));
|
||||
}
|
||||
await folding.emulateMedia({ reducedMotion: "reduce" });
|
||||
const reduced = await folding.evaluate(() => {
|
||||
const table = document.getElementById("pj-goal-table"), q = table.querySelector('thead th[data-col="q1"]');
|
||||
const cells = Array.from(table.querySelectorAll('.pj-goal-m[data-h="1"]'));
|
||||
q.click(); const hidden = cells.every(c => getComputedStyle(c).display === "none");
|
||||
q.click(); return hidden && cells.every(c => getComputedStyle(c).display !== "none") && !table.querySelector(".is-folding");
|
||||
});
|
||||
assert(reduced, "reduced motion uses immediate toggles");
|
||||
await folding.close();
|
||||
}
|
||||
console.log("PASS instant quarter reveal keeps numeric positions, saved widths and rapid-toggle state at 100%/75%");
|
||||
console.log("PASS animated quarter widths with stable numeric reveal, saved widths and concurrent/rapid toggles at 100%/75%");
|
||||
const page = await browser.newPage({ viewport: { width: 1600, height: 1000 } });
|
||||
const errors = [], writes = [];
|
||||
page.on("pageerror", function (e) { errors.push(e.message); });
|
||||
|
||||
@@ -604,10 +604,11 @@ function meetServer(env, st) {
|
||||
// 분기 접기는 보기 전용도
|
||||
const qth = env.d.querySelector('th.pj-goal-fold-th[data-h="1"]');
|
||||
qth.dispatchEvent(new env.w.MouseEvent("click", { bubbles: true }));
|
||||
check("[회귀] 분기 머리 클릭 → 즉시 접힘(보기 전용도)", qth.classList.contains("is-folded") && env.d.querySelector('td.pj-goal-m[data-h="1"]').classList.contains("is-gone"));
|
||||
check("[회귀] 분기 머리 클릭 → 접기 애니메이션(보기 전용도)", qth.classList.contains("is-folded") && env.d.querySelector('td.pj-goal-m[data-h="1"]').classList.contains("is-shrunk"));
|
||||
check("[회귀] 접기 상태 기억", /"1":true/.test(env.w.localStorage.getItem("pj_goal_fold_q") || ""));
|
||||
qth.dispatchEvent(new env.w.MouseEvent("click", { bubbles: true }));
|
||||
check("[회귀] 분기 머리 재클릭 → 즉시 펼침", !qth.classList.contains("is-folded") && !env.d.querySelector('td.pj-goal-m[data-h="1"]').classList.contains("is-gone"));
|
||||
await wait(380);
|
||||
check("[회귀] 분기 머리 재클릭 → 펼침 완료·오래된 타이머 취소", !qth.classList.contains("is-folded") && !env.d.querySelector('td.pj-goal-m[data-h="1"]').classList.contains("is-gone") && !env.d.querySelector('td.pj-goal-m[data-h="1"]').classList.contains("is-folding"));
|
||||
});
|
||||
await section(async function () { // 회귀 — 열 너비 끌기·고정 열 변수·스크롤 위치 되살리기
|
||||
const env = makeEnv(PAGE.goals_admin, GOALS_URL, { session: { pj_goal_scroll: JSON.stringify(["/project/goals/2026", 120, 45]) } });
|
||||
|
||||
Reference in New Issue
Block a user