creator/cc-1c-skills
1
0
Fork 0
mirror of https://github.com/Nikolay-Shirokov/cc-1c-skills.git synced 2026-07-15 23:35:17 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix(web-test): клик по строке грида на узких модальных формах подбора

Browse Source 
clickElement по строке грида целился в центр `.gridLine`, который на узкой
модальной форме подбора со множеством колонок (≈2775px при окне ~894px) уезжал
за пределы окна → mouse.click мимо строки, выделение не менялось (clickElement
при этом рапортовал успех). Проявлялось на форме множественного выбора (F4).

Общая логика клика вынесена в `ROW_CLICK_POINT_FN` (_shared.mjs): первая видимая
текстовая ячейка строки (skip checkbox/picture, skip tree-toggle, кламп X). Фикс
применён в findClickTargetScript (forms.mjs, row-select) и переиспользован в
scanGridRowsScript (grid.mjs, дедупликация inline-блока — путь selectValue).

Регресс: новый tests/web-test/20-modal-select-row.test.mjs (RED до фикса, GREEN
после). Полный набор — 23/23.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
Nick Shirokov
2026-06-28 17:17:32 +03:00
parent 022ba4e06c
commit 08ea3f0806
4 changed files with 107 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.claude/skills/web-test/scripts/dom/_shared.mjs
+30 -1
View File
@@ -1,4 +1,4 @@
// web-test dom shared v1.0 — embedded JS function constants
// web-test dom shared v1.1 — embedded JS function constants
// Source: https://github.com/Nikolay-Shirokov/cc-1c-skills
/**
* Shared function strings embedded into page.evaluate() generators.
@@ -14,6 +14,35 @@ export const HAS_VISIBLE_MODAL_FN = `function hasVisibleModal() {
return false;
}`;
/**
* Click point INSIDE a grid row's first visible text cell — NOT the row-line centre.
*
* A wide multi-column row's centre `x = line.x + line.width/2` lands far beyond the
* form's horizontal viewport (the `.gridLine` spans ALL columns, frozen + scrollable),
* so `mouse.click` at that X falls on an overlay outside the visible grid and the row
* is never hit — the click silently does nothing. Seen on narrow modal selection forms
* with many columns (множественный выбор) and the `not_selectable` bug on selection forms.
*
* Picks the first visible non-checkbox cell that HAS text (so center-clicking never
* toggles a checkbox/picture mark), skips the first column on tree grids (it holds the
* expand toggle), and clamps X near the left edge (`min(width/2, 60)`) so a wide first
* column still lands in the viewport.
*
* @param line a `.gridLine` element
* @param body the grid's `.gridBody` (for tree detection); may be null
* @returns `{ x, y }` rounded, or `null` when the row has no usable cell.
*/
export const ROW_CLICK_POINT_FN = `function rowClickPoint(line, body) {
const isTree = !!(body && body.querySelector('.gridBoxTree'));
let cells = [...line.children]
.filter(b => b.offsetWidth > 0)
.map(b => ({ r: b.getBoundingClientRect(), checkbox: !!b.querySelector('.checkbox'), hasText: !!b.querySelector('.gridBoxText') }));
if (isTree && cells.length > 1) cells = cells.slice(1);
const pick = cells.find(c => !c.checkbox && c.hasText) || cells.find(c => !c.checkbox) || cells[0];
if (!pick) return null;
return { x: Math.round(pick.r.x + Math.min(pick.r.width / 2, 60)), y: Math.round(pick.r.y + pick.r.height / 2) };
}`;
/** Detect active form number. Picks form with most visible elements, skipping form0.
* When modalSurface is visible — prefer the highest-numbered form (modal dialog). */
export const DETECT_FORM_FN = HAS_VISIBLE_MODAL_FN + `
.claude/skills/web-test/scripts/dom/forms.mjs
+9 -3
View File
@@ -1,6 +1,6 @@
// web-test dom/forms v1.6 — form detection, content read, click-target/field-button resolution
// web-test dom/forms v1.7 — form detection, content read, click-target/field-button resolution
// Source: https://github.com/Nikolay-Shirokov/cc-1c-skills
import { DETECT_FORM_FN, READ_FORM_FN } from './_shared.mjs';
import { DETECT_FORM_FN, READ_FORM_FN, ROW_CLICK_POINT_FN } from './_shared.mjs';
/**
* Detect the active form number.
@@ -34,6 +34,7 @@ export function readFormScript(formNum) {
export function findClickTargetScript(formNum, text, { tableName, gridSelector } = {}) {
const p = `form${formNum}_`;
return `(() => {
${ROW_CLICK_POINT_FN}
const norm = s => (s?.trim().replace(/\\u00a0/g, ' ') || '').replace(/ё/gi, 'е');
const target = ${JSON.stringify(text.toLowerCase().replace(/ё/g, 'е'))};
const p = ${JSON.stringify(p)};
@@ -196,9 +197,14 @@ export function findClickTargetScript(formNum, text, { tableName, gridSelector }
else if (isParent) kind = 'gridParent';
else if (isTreeNode && hasChildren) kind = 'gridTreeNode';
else kind = 'gridRow';
// Click point: first visible text cell of the row, NOT the row-line centre.
// A wide multi-column row's centre lands beyond the form's viewport (e.g. on
// narrow modal selection forms) so mouse.click misses the row. See ROW_CLICK_POINT_FN.
const pt = rowClickPoint(line, body);
const r = line.getBoundingClientRect();
return { id: '', kind, name: rowTexts[0] || '', gridId: grid.id,
x: Math.round(r.x + r.width / 2), y: Math.round(r.y + r.height / 2) };
x: pt ? pt.x : Math.round(r.x + r.width / 2),
y: pt ? pt.y : Math.round(r.y + r.height / 2) };
}
}
}
.claude/skills/web-test/scripts/dom/grid.mjs
+10 -11
View File
@@ -1,5 +1,6 @@
// web-test dom/grid v1.10 — grid resolution + table reading + edit-time helpers
// web-test dom/grid v1.11 — grid resolution + table reading + edit-time helpers
// Source: https://github.com/Nikolay-Shirokov/cc-1c-skills
import { ROW_CLICK_POINT_FN } from './_shared.mjs';
/**
* Resolve a specific grid by semantic name (table parameter).
@@ -427,6 +428,7 @@ export function getSelectedOrLastRowIndexScript(gridSelector) {
*/
export function scanGridRowsScript(formNum, search) {
return `(() => {
${ROW_CLICK_POINT_FN}
const p = 'form${formNum}_';
const grid = document.querySelector('[id^="' + p + '"].grid, [id^="' + p + '"] .grid');
if (!grid) return null;
@@ -513,21 +515,18 @@ export function scanGridRowsScript(formNum, search) {
if (!sel) return { rowCount: lines.length, visibleSample };
// Click point: first visible text cell of the row (mirror findFocusCellScript)
// — skip checkboxes; on tree grids skip the first (expand-toggle) column.
// Clamp X near the left so a wide first column still lands in the viewport.
const isTree = !!body.querySelector('.gridBoxTree');
let cells = visCells(sel).map(b => ({ r: b.getBoundingClientRect(), checkbox: !!b.querySelector('.checkbox'), hasText: !!b.querySelector('.gridBoxText') }));
if (isTree && cells.length > 1) cells = cells.slice(1);
const pick = cells.find(c => !c.checkbox && c.hasText) || cells.find(c => !c.checkbox) || cells[0];
if (!pick) return { rowCount: lines.length, visibleSample };
// Click point: first visible text cell of the row (skip checkboxes; on tree grids
// skip the expand-toggle column; clamp X near the left). Shared with the
// clickElement row-select path — see ROW_CLICK_POINT_FN.
const pt = rowClickPoint(sel, body);
if (!pt) return { rowCount: lines.length, visibleSample };
const imgBox = sel.querySelector('.gridBoxImg');
const isGroup = imgBox ? !!imgBox.querySelector('.gridListH') : false;
return {
rowCount: lines.length,
x: Math.round(pick.r.x + Math.min(pick.r.width / 2, 60)),
y: Math.round(pick.r.y + pick.r.height / 2),
x: pt.x,
y: pt.y,
isGroup, matchKind, visibleSample
};
})()`;