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

fix(web-test): fix highlight bugs — search priority, modal overlap, section/command support

Browse Source 
- Reorder highlight() search: form elements first, sections/commands as
  fallback. Fixes false match where "ОК" matched section "Покупки" via
  substring .includes() ("пок" contains "ок")
- Unhighlight before action in clickElement/selectValue (was only in
  finally block, causing overlay to cover modals opened by the click)
- Add auto-highlight support to navigateSection and openCommand

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
Nick Shirokov
2026-03-01 14:26:49 +03:00
parent f956749e1e
commit cc751a344e
1 changed files with 61 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.claude/skills/web-test/scripts/browser.mjs
+61 -60
View File
@@ -315,6 +315,7 @@ export async function getSections() {
export async function navigateSection(name) { export async function navigateSection(name) {
ensureConnected(); ensureConnected();
await dismissPendingErrors(); await dismissPendingErrors();
if (highlightMode) try { await highlight(name); await page.waitForTimeout(500); await unhighlight(); } catch {}
const result = await page.evaluate(navigateSectionScript(name)); const result = await page.evaluate(navigateSectionScript(name));
if (result?.error) throw new Error(`navigateSection: "${name}" not found. Available: ${result.available?.join(', ') || 'none'}`); if (result?.error) throw new Error(`navigateSection: "${name}" not found. Available: ${result.available?.join(', ') || 'none'}`);
@@ -336,6 +337,7 @@ export async function getCommands() {
export async function openCommand(name) { export async function openCommand(name) {
ensureConnected(); ensureConnected();
await dismissPendingErrors(); await dismissPendingErrors();
if (highlightMode) try { await highlight(name); await page.waitForTimeout(500); await unhighlight(); } catch {}
const formBefore = await page.evaluate(detectFormScript()); const formBefore = await page.evaluate(detectFormScript());
const result = await page.evaluate(openCommandScript(name)); const result = await page.evaluate(openCommandScript(name));
if (result?.error) throw new Error(`openCommand: "${name}" not found. Available: ${result.available?.join(', ') || 'none'}`); if (result?.error) throw new Error(`openCommand: "${name}" not found. Available: ${result.available?.join(', ') || 'none'}`);
@@ -1089,7 +1091,7 @@ export async function fillFields(fields) {
export async function clickElement(text, { dblclick } = {}) { export async function clickElement(text, { dblclick } = {}) {
ensureConnected(); ensureConnected();
await dismissPendingErrors(); await dismissPendingErrors();
if (highlightMode) try { await highlight(text); await page.waitForTimeout(500); } catch {} if (highlightMode) try { await highlight(text); await page.waitForTimeout(500); await unhighlight(); } catch {}
try { try {
// First check if there's a confirmation dialog — click matching button // First check if there's a confirmation dialog — click matching button
@@ -1371,7 +1373,7 @@ export async function selectValue(fieldName, searchText) {
btn = await page.evaluate(findFieldButtonScript(formNum, fieldName, 'CB')); btn = await page.evaluate(findFieldButtonScript(formNum, fieldName, 'CB'));
} }
if (btn?.error) return btn; if (btn?.error) return btn;
if (highlightMode) try { await highlight(fieldName); await page.waitForTimeout(500); } catch {} if (highlightMode) try { await highlight(fieldName); await page.waitForTimeout(500); await unhighlight(); } catch {}
try { try {
// Auto-enable DCS checkbox if resolved via label // Auto-enable DCS checkbox if resolved via label
@@ -1463,9 +1465,6 @@ export async function selectValue(fieldName, searchText) {
})()`); })()`);
} }
// Remove highlight before DLB click — overlay would cover dropdown/selection form
if (highlightMode) try { await unhighlight(); } catch {}
// 2. Click DLB (handle funcPanel / surface overlay intercept) // 2. Click DLB (handle funcPanel / surface overlay intercept)
const dlbSel = `[id="${btn.buttonId}"]`; const dlbSel = `[id="${btn.buttonId}"]`;
try { try {
@@ -2665,64 +2664,66 @@ export async function highlight(text, opts = {}) {
let elId = null; let elId = null;
// 0. Try section or command (outside form scope) // 1. Form-scoped search FIRST (buttons, links, fields, grid rows)
elId = await page.evaluate(`(() => { // Priority: form elements > sections/commands — avoids false matches
const norm = s => (s?.trim().replace(/\\u00a0/g, ' ') || '').replace(/ё/gi, 'е'); // like "ОК" matching section "Покупки" via .includes()
const target = ${JSON.stringify(normYo(text.toLowerCase()))}; const formNum = await page.evaluate(detectFormScript());
// Sections if (formNum !== null) {
const secs = [...document.querySelectorAll('[id^="themesCell_theme_"]')]; // 1a. Try button/link/tab/gridRow via findClickTargetScript
let el = secs.find(e => norm(e.innerText).toLowerCase() === target); const target = await page.evaluate(findClickTargetScript(formNum, text));
if (!el) el = secs.find(e => norm(e.innerText).toLowerCase().includes(target)); if (target && !target.error) {
if (el) return el.id; if (target.id) {
// Commands elId = target.id;
const cmds = [...document.querySelectorAll('[id^="cmd_"][id$="_txt"]')].filter(e => e.offsetWidth > 0); } else if (target.x && target.y) {
el = cmds.find(e => norm(e.innerText).toLowerCase() === target); // Grid row — find the gridLine element and tag it
if (!el) el = cmds.find(e => norm(e.innerText).toLowerCase().includes(target)); elId = await page.evaluate(`(() => {
if (el) return el.id; const p = ${JSON.stringify(`form${formNum}_`)};
return null; const grid = document.querySelector('[id^="' + p + '"].grid');
})()`); if (!grid) return null;
const body = grid.querySelector('.gridBody');
// 1-2. Form-scoped search (buttons, links, fields, grid rows) if (!body) return null;
if (!elId) { const norm = s => (s?.trim().replace(/\\u00a0/g, ' ') || '').replace(/ё/gi, 'е');
const formNum = await page.evaluate(detectFormScript()); const target = ${JSON.stringify(normYo(text.toLowerCase()))};
if (formNum !== null) { for (const line of body.querySelectorAll('.gridLine')) {
// 1. Try button/link/tab/gridRow via findClickTargetScript const cells = [...line.querySelectorAll('.gridBoxText')].filter(b => b.offsetWidth > 0);
const target = await page.evaluate(findClickTargetScript(formNum, text)); const rowText = cells.map(b => b.innerText?.trim() || '').join(' ').toLowerCase().replace(/ё/gi, 'е');
if (target && !target.error) { if (rowText.includes(target)) {
if (target.id) { if (!line.id) line.id = '__wt_hl_tmp';
elId = target.id; return line.id;
} else if (target.x && target.y) {
// Grid row — find the gridLine element and tag it
elId = await page.evaluate(`(() => {
const p = ${JSON.stringify(`form${formNum}_`)};
const grid = document.querySelector('[id^="' + p + '"].grid');
if (!grid) return null;
const body = grid.querySelector('.gridBody');
if (!body) return null;
const norm = s => (s?.trim().replace(/\\u00a0/g, ' ') || '').replace(/ё/gi, 'е');
const target = ${JSON.stringify(normYo(text.toLowerCase()))};
for (const line of body.querySelectorAll('.gridLine')) {
const cells = [...line.querySelectorAll('.gridBoxText')].filter(b => b.offsetWidth > 0);
const rowText = cells.map(b => b.innerText?.trim() || '').join(' ').toLowerCase().replace(/ё/gi, 'е');
if (rowText.includes(target)) {
if (!line.id) line.id = '__wt_hl_tmp';
return line.id;
}
} }
return null; }
})()`); return null;
} })()`);
}
// 2. If not found as button — try as field via resolveFieldsScript
if (!elId) {
const dummyFields = { [text]: '' };
const resolved = await page.evaluate(resolveFieldsScript(formNum, dummyFields));
if (resolved?.length > 0 && !resolved[0].error && resolved[0].inputId) {
elId = resolved[0].inputId;
}
} }
} }
// 1b. If not found as button — try as field via resolveFieldsScript
if (!elId) {
const dummyFields = { [text]: '' };
const resolved = await page.evaluate(resolveFieldsScript(formNum, dummyFields));
if (resolved?.length > 0 && !resolved[0].error && resolved[0].inputId) {
elId = resolved[0].inputId;
}
}
}
// 2. Fallback: section or command (outside form scope)
if (!elId) {
elId = await page.evaluate(`(() => {
const norm = s => (s?.trim().replace(/\\u00a0/g, ' ') || '').replace(/ё/gi, 'е');
const target = ${JSON.stringify(normYo(text.toLowerCase()))};
// Sections
const secs = [...document.querySelectorAll('[id^="themesCell_theme_"]')];
let el = secs.find(e => norm(e.innerText).toLowerCase() === target);
if (!el) el = secs.find(e => norm(e.innerText).toLowerCase().includes(target));
if (el) return el.id;
// Commands
const cmds = [...document.querySelectorAll('[id^="cmd_"][id$="_txt"]')].filter(e => e.offsetWidth > 0);
el = cmds.find(e => norm(e.innerText).toLowerCase() === target);
if (!el) el = cmds.find(e => norm(e.innerText).toLowerCase().includes(target));
if (el) return el.id;
return null;
})()`);
} }
if (!elId) throw new Error(`highlight: "${text}" not found`); if (!elId) throw new Error(`highlight: "${text}" not found`);