refactor(web-test): распил clickElement по доменам (Phase 5, §10)

core/click.mjs (307 LOC) распилен на тонкий dispatcher (~105 LOC) + 3 доменных handler-файла. Закрывает §10 родительского плана (отклонение на этапе C.10 — «split — наследие плана»). Структура: - core/click.mjs (~105 LOC) — dispatcher: ensureConnected, spreadsheet-cell spec, highlight, confirmation/popup interception, findTarget, dispatch по target.kind - core/helpers.mjs +modifierClick(x, y, modifier, {dbl?}) — общий mouse-click helper с поддержкой Ctrl/Shift модификаторов - forms/click-popup.mjs (~90 LOC) — clickConfirmationButton + tryClickPopupItem (popup/confirmation внутри формы — форменный контекст, не навигация) - forms/click-form.mjs (~107 LOC) — clickFormTarget: button/tab/submenu + netMonitor lifecycle + post-click submenu detection + confirmation hint propagation - table/click-row.mjs (~95 LOC) — clickGridGroupTarget, clickGridTreeNodeTarget, clickGridRowTarget с переиспользованием modifierClick и существующих getGridToggleIcon/shouldClickToggle Контракт dispatcher → handler: (target, ctx) где ctx = {formNum, modifier, dblclick, toggle, expand, timeout, table, gridSelector}. Handler возвращает returnFormState({clicked, ...}). Граф зависимостей остаётся деревом: - core/click.mjs → table/click-row, forms/click-popup, forms/click-form, spreadsheet - table/{filter,grid,row-fill}.mjs → core/click.mjs (другие action-функции) - handler-модули → helpers, wait, grid-toggle (НЕ click.mjs) Поведение clickElement 1:1, публичный API без изменений. netMonitor переехал внутрь clickFormTarget со своим try/finally. Confirmation hint propagation (тот сайт что Phase 2 НЕ конвертировал) переехал в clickFormTarget — естественное место. Точечный регресс 7/7 (02-crud, 05-table, 08-hierarchy, 13-misc, 16-tree-form, 11-report, 01-navigation) + полный 19/19 зелёный. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2026-07-19 17:19:42 +03:00 · 2026-05-27 18:00:48 +03:00
parent a9949ff5fe
commit 60151c801f
5 changed files with 411 additions and 308 deletions
@@ -0,0 +1,107 @@
+// web-test forms/click-form v1.0 — click handler for form-element targets: button, tab, submenu, link.
+// Source: https://github.com/Nikolay-Shirokov/cc-1c-skills
+//
+// Called by core/click.mjs dispatcher after target is found.
+// Owns the CDP network-monitor lifecycle for button clicks (server roundtrip waits),
+// post-click submenu detection (split buttons like "Создать на основании"),
+// and confirmation hint propagation in the final state.
+
+import { page, ACTION_WAIT } from '../core/state.mjs';
+import {
+  detectFormScript, readSubmenuScript,
+} from '../../dom.mjs';
+import { checkForErrors } from '../core/errors.mjs';
+import { waitForStable, startNetworkMonitor } from '../core/wait.mjs';
+import { safeClick, returnFormState } from '../core/helpers.mjs';
+
+/**
+ * Click a form target (button, tab, submenu, link) using its resolved {kind, id, x, y, name}.
+ * Handles three special concerns:
+ *   1. **netMonitor** for `kind: 'button'` — captures CDP requests started by the click
+ *      so we can wait for them (when the form doesn't change) before stabilising.
+ *   2. **Submenu detection** — both pre-click (`kind: 'submenu'` already known) and
+ *      post-click (split buttons like "Создать на основании" which open a popup).
+ *      Returns `submenu[]` items as a hint for the caller.
+ *   3. **Confirmation propagation** — if a confirmation dialog opens as a result of the
+ *      click, surface `confirmation` and `hint` fields on the returned state so the
+ *      caller can react with Да/Нет/Отмена on the next call.
+ */
+export async function clickFormTarget(target, ctx) {
+  const { formNum, timeout } = ctx;
+  let netMonitor = null;
+
+  try {
+    // CDP network monitor BEFORE the click for buttons — captures all server requests
+    // triggered by the click so we can wait for them after.
+    if (target.kind === 'button') {
+      try { netMonitor = await startNetworkMonitor(); } catch {}
+    }
+
+    // Tabs without ID — use coordinate click to avoid global [data-content] ambiguity
+    if (target.kind === 'tab' && !target.id && target.x && target.y) {
+      await page.mouse.click(target.x, target.y);
+    } else {
+      const selector = `[id="${target.id}"]`;
+      // Use Playwright click for proper mousedown/mouseup events
+      await safeClick(selector, { timeout: 5000 });
+    }
+
+    // Pre-known submenu button — read popup items and return them as hints
+    if (target.kind === 'submenu') {
+      await page.waitForTimeout(ACTION_WAIT);
+      const submenuItems = await page.evaluate(readSubmenuScript());
+      const extras = { clicked: { kind: 'submenu', name: target.name } };
+      if (Array.isArray(submenuItems)) {
+        extras.submenu = submenuItems.map(i => i.name);
+        extras.hint = 'Call web_click again with a submenu item name to select it';
+      }
+      return returnFormState(extras);
+    }
+
+    await waitForStable(formNum);
+
+    // Check if the click opened a popup/submenu (split buttons like "Создать на основании")
+    const openedPopup = await page.evaluate(readSubmenuScript());
+    if (Array.isArray(openedPopup) && openedPopup.length > 0) {
+      return returnFormState({
+        clicked: { kind: 'submenu', name: target.name },
+        submenu: openedPopup.map(i => i.name),
+        hint: 'Call web_click again with a submenu item name to select it',
+      });
+    }
+
+    // For buttons that trigger server-side operations (post, write, etc.),
+    // the DOM may stabilise BEFORE the server response arrives.
+    // The CDP monitor (started before click) lets us wait for all in-flight requests
+    // to complete (300ms debounce) or for a modal/balloon/confirm to appear.
+    // Skip for grid edit mode (e.g. "Добавить" row) — no server round-trip expected.
+    if (target.kind === 'button') {
+      const postForm = await page.evaluate(detectFormScript());
+      if (postForm === formNum) {
+        const inGridEdit = await page.evaluate(`(() => {
+          const f = document.activeElement;
+          if (!f || (f.tagName !== 'INPUT' && f.tagName !== 'TEXTAREA')) return false;
+          let n = f; while (n) { if (n.classList?.contains('grid')) return true; n = n.parentElement; }
+          return false;
+        })()`);
+        if (!inGridEdit && netMonitor) {
+          await netMonitor.waitDone(timeout);
+          await waitForStable();
+        }
+      }
+    }
+
+    // Build final state with confirmation propagation
+    // (the one custom branch deliberately skipped by Phase 2 — surfaces confirmation
+    //  + hint when a save/delete dialog opened as a result of the click).
+    const extras = { clicked: { kind: target.kind, name: target.name } };
+    const err = await checkForErrors();
+    if (err?.confirmation) {
+      extras.confirmation = err.confirmation;
+      extras.hint = 'Call web_click with a button name (e.g. "Да", "Нет", "Отмена") to respond';
+    }
+    return returnFormState(extras);
+  } finally {
+    if (netMonitor) try { await netMonitor.cleanup(); } catch {}
+  }
+}
@@ -0,0 +1,90 @@
+// web-test forms/click-popup v1.0 — click handlers for in-form popups: confirmation dialogs and open submenus.
+// Source: https://github.com/Nikolay-Shirokov/cc-1c-skills
+//
+// Both handlers run BEFORE clickElement's regular target-finding flow:
+//   - clickConfirmationButton intercepts when a pending confirmation dialog is open
+//   - tryClickPopupItem intercepts when a submenu/popup is open from a previous click
+
+import { page, ACTION_WAIT, normYo } from '../core/state.mjs';
+import { readSubmenuScript } from '../../dom.mjs';
+import { waitForStable } from '../core/wait.mjs';
+import { returnFormState } from '../core/helpers.mjs';
+
+/**
+ * Click a button in the currently-open confirmation dialog (Да/Нет/Отмена, etc).
+ * Caller is responsible for verifying that a confirmation is actually pending
+ * (via checkForErrors().confirmation) before invoking this handler.
+ *
+ * Throws if no button matching `text` is found in the dialog.
+ */
+export async function clickConfirmationButton(text) {
+  const btnResult = await page.evaluate(`(() => {
+    const norm = s => s?.trim().replace(/\\u00a0/g, ' ') || '';
+    const ny = s => s.replace(/ё/gi, 'е').replace(/\\u00a0/g, ' ');
+    const target = ny(${JSON.stringify(text.toLowerCase())});
+    const btns = [...document.querySelectorAll('a.press.pressButton')].filter(el => el.offsetWidth > 0);
+    let best = btns.find(el => ny(norm(el.innerText).toLowerCase()) === target);
+    if (!best) best = btns.find(el => ny(norm(el.innerText).toLowerCase()).includes(target));
+    if (best) {
+      const r = best.getBoundingClientRect();
+      return { name: norm(best.innerText), x: Math.round(r.x + r.width/2), y: Math.round(r.y + r.height/2) };
+    }
+    return { error: 'not_found', available: btns.map(el => norm(el.innerText)).filter(Boolean) };
+  })()`);
+  if (btnResult?.error) {
+    throw new Error(`clickElement: "${text}" not found among confirmation buttons. Available: ${btnResult.available?.join(', ') || 'none'}`);
+  }
+  await page.mouse.click(btnResult.x, btnResult.y);
+  await waitForStable();
+  return returnFormState({ clicked: { kind: 'confirmation', name: btnResult.name } });
+}
+
+/**
+ * Try to click an item inside an already-open submenu/popup.
+ *
+ * Returns a form-state result on match (kind: 'popupItem' or 'submenuArrow'),
+ * or `null` if the requested text doesn't match any visible popup item — in
+ * which case the caller should fall through to regular form-element finding.
+ *
+ * @param {string} text — fuzzy-matched against item labels (NBSP/ё-normalised)
+ * @param {Array} popupItems — items already read via readSubmenuScript()
+ */
+export async function tryClickPopupItem(text, popupItems) {
+  const target = normYo(text.toLowerCase());
+  let found = popupItems.find(i => normYo(i.name.toLowerCase()) === target);
+  if (!found) found = popupItems.find(i => normYo(i.name.toLowerCase()).includes(target));
+  if (!found) return null;
+
+  // submenuArrow items (group headers like "Создать", "Печать") — hover to expand nested submenu
+  if (found.kind === 'submenuArrow') {
+    // page.hover(selector) is more reliable than page.mouse.move(x,y) —
+    // some submenu groups don't expand with plain mouse.move
+    if (found.id) {
+      await page.hover(`[id="${found.id}"]`);
+    } else {
+      await page.mouse.move(found.x, found.y);
+    }
+    await page.waitForTimeout(ACTION_WAIT);
+    const nestedItems = await page.evaluate(readSubmenuScript());
+    const extras = { clicked: { kind: 'submenuArrow', name: found.name } };
+    if (Array.isArray(nestedItems)) {
+      extras.submenu = nestedItems.map(i => i.name);
+      extras.hint = 'Call web_click again with a submenu item name to select it';
+    }
+    return returnFormState(extras);
+  }
+
+  // Regular submenu/dropdown items — trusted events required.
+  // Use mouse.click(x,y) when in viewport; use :visible selector for clipped items
+  // (same ID can exist hidden in parent cloud AND visible in nested cloud).
+  const vpHeight = await page.evaluate('window.innerHeight');
+  if (found.x && found.y && found.y > 0 && found.y < vpHeight) {
+    await page.mouse.click(found.x, found.y);
+  } else if (found.id) {
+    await page.click(`[id="${found.id}"]:visible`);
+  } else if (found.x && found.y) {
+    await page.mouse.click(found.x, found.y);
+  }
+  await waitForStable();
+  return returnFormState({ clicked: { kind: 'popupItem', name: found.name } });
+}