From 62bf47a0e9199c23d68d7735067052e6121f7486 Mon Sep 17 00:00:00 2001 From: t8y2 Date: Tue, 29 Sep 2026 10:59:05 +0800 Subject: [PATCH] fix(ai): restore progressive composer controls --- .../src/components/editor/AiAssistant.vue | 180 ++++++++++++------ .../__tests__/AiAssistant.mount.spec.ts | 99 ++++++++++ 2 files changed, 221 insertions(+), 58 deletions(-) diff --git a/apps/desktop/src/components/editor/AiAssistant.vue b/apps/desktop/src/components/editor/AiAssistant.vue index ddfffa182d..358d8e9065 100644 --- a/apps/desktop/src/components/editor/AiAssistant.vue +++ b/apps/desktop/src/components/editor/AiAssistant.vue @@ -3,7 +3,7 @@ import { computed, defineAsyncComponent, h, nextTick, onMounted, onUnmounted, re import { uuid } from "@/lib/common/utils"; import { useI18n } from "vue-i18n"; import { translateBackendError } from "@/i18n/backend-errors"; -import { deferUntilPanelResizeEnd } from "@/lib/app/panelResizeState"; +import { deferUntilPanelResizeEnd, isPanelResizing } from "@/lib/app/panelResizeState"; import { ArrowDown, ArrowUp, @@ -1228,19 +1228,27 @@ const pendingCompaction = ref<{ summary: string; compactedMessages: number } | n const AI_TEXTAREA_MIN_HEIGHT_PX = 64; const AI_TEXTAREA_MAX_PANEL_RATIO = 0.5; const AI_TEXTAREA_HEIGHT_STORAGE_KEY = "dbx-ai-textarea-height"; +const AI_RESPONSIVE_DRAG_MEASURE_STEP_PX = 16; const textareaHeight = ref(AI_TEXTAREA_MIN_HEIGHT_PX); const assistantRootRef = ref(null); const promptPanelRef = ref(null); const compactContextControls = ref(false); -const compactActionControls = ref(false); +const compactModelControl = ref(false); +const compactModeActionControl = ref(false); const isResizing = ref(false); let resizeStartY = 0; let resizeStartHeight = 0; let promptPanelResizeObserver: ResizeObserver | undefined; let responsiveControlMeasureFrame: number | null = null; let responsiveControlMeasureForce = false; +let responsiveControlObservedWidth: number | null = null; let lastResponsiveControlWidth: number | null = null; +let latestResponsiveControlDragWidth: number | null = null; +let lastResponsiveControlDragMeasureWidth: number | null = null; +let responsiveControlDragMeasureRunning = false; +let responsiveControlDragMeasureQueued = false; +let responsiveControlDragEpoch = 0; interface AiTableMentionCandidate { kind: "table"; @@ -5130,11 +5138,11 @@ onMounted(async () => { appearance: () => aiCodeAppearance.value, }).catch(() => undefined); - window.addEventListener("resize", handlePanelResize); + window.addEventListener("resize", handleWindowResize); document.addEventListener("dbx:tauri-file-drop", onTauriFileDrop as EventListener); window.addEventListener(DBX_TABLE_REFERENCE_DROP_EVENT, onTableReferenceDropEvent); if (typeof ResizeObserver !== "undefined" && assistantRootRef.value) { - promptPanelResizeObserver = new ResizeObserver(handlePanelResize); + promptPanelResizeObserver = new ResizeObserver(handleObservedPanelResize); promptPanelResizeObserver.observe(assistantRootRef.value); if (promptPanelRef.value) promptPanelResizeObserver.observe(promptPanelRef.value); } @@ -5153,9 +5161,24 @@ function clampTextareaHeight(height: number) { return Math.max(AI_TEXTAREA_MIN_HEIGHT_PX, Math.min(maxTextareaHeight(), Math.round(height))); } -function handlePanelResize() { +function handleWindowResize() { + handlePanelResize(); +} + +function handleObservedPanelResize(entries: ResizeObserverEntry[]) { + const promptPanel = promptPanelRef.value; + const promptPanelEntry = promptPanel ? entries.find((entry) => entry.target === promptPanel) : undefined; + handlePanelResize(promptPanelEntry?.contentRect.width); +} + +function handlePanelResize(observedPanelWidth?: number) { + if (isPanelResizing.value) { + deferUntilPanelResizeEnd(resyncPromptPanelAfterPanelResize); + if (typeof observedPanelWidth === "number") scheduleResponsiveControlDragMeasurement(observedPanelWidth); + return; + } textareaHeight.value = clampTextareaHeight(textareaHeight.value); - scheduleResponsiveControlMeasurement(); + scheduleResponsiveControlMeasurement(false, observedPanelWidth); } function hasHorizontalOverflow(element: HTMLElement | null): boolean { @@ -5167,48 +5190,99 @@ function hasOverflowingLabel(element: HTMLElement | null, selector: string): boo return Array.from(element.querySelectorAll(selector)).some((label) => label.scrollWidth > label.clientWidth + 1); } -async function measureResponsiveControls(force = false) { - const panel = promptPanelRef.value; - if (!panel) return; - // Reading clientWidth/scrollWidth here forces a document-wide synchronous - // relayout, and the AI panel divider drag fires resize events every frame. - // Skip measurements while the drag is in flight and re-measure once at the end. - if ( - deferUntilPanelResizeEnd(() => { - void measureResponsiveControls(force); - }) - ) - return; - const panelWidth = panel.clientWidth; +function actionControlsOverflow(actionRow: HTMLElement | null): boolean { + return hasHorizontalOverflow(actionRow) || hasOverflowingLabel(actionRow, ".ai-mode-action-label, .ai-model-selector-label, .ai-prompt-queue-label"); +} + +function resyncPromptPanelAfterPanelResize() { + responsiveControlDragEpoch += 1; + latestResponsiveControlDragWidth = null; + lastResponsiveControlDragMeasureWidth = null; + responsiveControlDragMeasureQueued = false; + if (!assistantViewMounted) return; + textareaHeight.value = clampTextareaHeight(textareaHeight.value); + scheduleResponsiveControlMeasurement(true); +} + +async function applyResponsiveControlMeasurement(panel: HTMLElement, panelWidth: number, force: boolean, panelResizeEpoch?: number) { if (!force && lastResponsiveControlWidth === panelWidth) return; - // Measure the full labels before deciding to compact. This lets a wide - // composer recover from icon mode after it grows, while the actual - // overflow checks decide independently for the context and action rows. - if (compactContextControls.value || compactActionControls.value) { + if (compactContextControls.value || compactModelControl.value || compactModeActionControl.value) { compactContextControls.value = false; - compactActionControls.value = false; + compactModelControl.value = false; + compactModeActionControl.value = false; await nextTick(); + if (panelResizeEpoch !== undefined && (!isPanelResizing.value || panelResizeEpoch !== responsiveControlDragEpoch)) return; } const contextRow = panel.querySelector("[data-ai-composer-context-row]"); const actionRow = panel.querySelector("[data-ai-composer-actions]"); const contextOverflow = hasHorizontalOverflow(contextRow) || hasOverflowingLabel(contextRow, ".ai-template-selector-label, .ai-skills-selector-label"); - const actionOverflow = hasHorizontalOverflow(actionRow) || hasOverflowingLabel(actionRow, ".ai-mode-action-label, .ai-model-selector-label, .ai-prompt-queue-label"); compactContextControls.value = contextOverflow; - compactActionControls.value = actionOverflow; - lastResponsiveControlWidth = panelWidth; + if (actionControlsOverflow(actionRow)) { + compactModelControl.value = true; + await nextTick(); + if (panelResizeEpoch !== undefined && (!isPanelResizing.value || panelResizeEpoch !== responsiveControlDragEpoch)) return; + compactModeActionControl.value = actionControlsOverflow(actionRow); + } + lastResponsiveControlWidth = panelResizeEpoch === undefined ? panelWidth : (latestResponsiveControlDragWidth ?? panelWidth); } -function scheduleResponsiveControlMeasurement(force = false) { +async function flushResponsiveControlDragMeasurements() { + if (responsiveControlDragMeasureRunning) return; + responsiveControlDragMeasureRunning = true; + const panelResizeEpoch = responsiveControlDragEpoch; + try { + while (responsiveControlDragMeasureQueued && isPanelResizing.value && panelResizeEpoch === responsiveControlDragEpoch) { + responsiveControlDragMeasureQueued = false; + const panelWidth = latestResponsiveControlDragWidth; + const panel = promptPanelRef.value; + if (panelWidth === null || !panel) continue; + if (lastResponsiveControlDragMeasureWidth !== null && Math.abs(panelWidth - lastResponsiveControlDragMeasureWidth) < AI_RESPONSIVE_DRAG_MEASURE_STEP_PX) continue; + lastResponsiveControlDragMeasureWidth = panelWidth; + await applyResponsiveControlMeasurement(panel, panelWidth, true, panelResizeEpoch); + const latestWidth = latestResponsiveControlDragWidth; + if (latestWidth !== null && Math.abs(latestWidth - panelWidth) >= AI_RESPONSIVE_DRAG_MEASURE_STEP_PX) responsiveControlDragMeasureQueued = true; + } + } finally { + responsiveControlDragMeasureRunning = false; + if (responsiveControlDragMeasureQueued && isPanelResizing.value) void flushResponsiveControlDragMeasurements(); + } +} + +function scheduleResponsiveControlDragMeasurement(observedPanelWidth: number) { + latestResponsiveControlDragWidth = Math.round(observedPanelWidth); + responsiveControlDragMeasureQueued = true; + void flushResponsiveControlDragMeasurements(); +} + +async function measureResponsiveControls(force = false, observedPanelWidth?: number) { + const panel = promptPanelRef.value; + if (!panel) return; + + if (isPanelResizing.value) { + deferUntilPanelResizeEnd(resyncPromptPanelAfterPanelResize); + if (typeof observedPanelWidth === "number") scheduleResponsiveControlDragMeasurement(observedPanelWidth); + return; + } + + lastResponsiveControlDragMeasureWidth = null; + const panelWidth = typeof observedPanelWidth === "number" ? Math.round(observedPanelWidth) : panel.clientWidth; + await applyResponsiveControlMeasurement(panel, panelWidth, force); +} + +function scheduleResponsiveControlMeasurement(force = false, observedPanelWidth?: number) { responsiveControlMeasureForce ||= force; + if (typeof observedPanelWidth === "number") responsiveControlObservedWidth = observedPanelWidth; if (responsiveControlMeasureFrame !== null) return; const measure = () => { responsiveControlMeasureFrame = null; const forceMeasure = responsiveControlMeasureForce; + const measuredPanelWidth = responsiveControlObservedWidth; responsiveControlMeasureForce = false; - void measureResponsiveControls(forceMeasure); + responsiveControlObservedWidth = null; + void measureResponsiveControls(forceMeasure, measuredPanelWidth ?? undefined); }; if (typeof window !== "undefined" && typeof window.requestAnimationFrame === "function") { responsiveControlMeasureFrame = window.requestAnimationFrame(measure); @@ -5296,7 +5370,7 @@ onUnmounted(() => { // 若卸载时仍在拖拽,复位 body 样式,避免全局残留 document.body.style.userSelect = ""; document.body.style.cursor = ""; - window.removeEventListener("resize", handlePanelResize); + window.removeEventListener("resize", handleWindowResize); document.removeEventListener("dbx:tauri-file-drop", onTauriFileDrop as EventListener); window.removeEventListener(DBX_TABLE_REFERENCE_DROP_EVENT, onTableReferenceDropEvent); promptPanelResizeObserver?.disconnect(); @@ -5305,6 +5379,11 @@ onUnmounted(() => { responsiveControlMeasureFrame = null; } responsiveControlMeasureForce = false; + responsiveControlObservedWidth = null; + latestResponsiveControlDragWidth = null; + lastResponsiveControlDragMeasureWidth = null; + responsiveControlDragMeasureQueued = false; + responsiveControlDragEpoch += 1; }); function triggerAction(action: AiAction, instruction?: string) { @@ -6354,7 +6433,7 @@ async function openExternalUrl(url: string) { {{ t("ai.status.longRunningHint") }} -
+