diff --git a/apps/desktop/src/components/structure/TableStructureEditor.primaryKey.spec.ts b/apps/desktop/src/components/structure/TableStructureEditor.primaryKey.spec.ts index 7fc58b7c74..7198a4b1eb 100644 --- a/apps/desktop/src/components/structure/TableStructureEditor.primaryKey.spec.ts +++ b/apps/desktop/src/components/structure/TableStructureEditor.primaryKey.spec.ts @@ -227,6 +227,8 @@ vi.mock("@/stores/settingsStore", () => ({ })); vi.mock("@/composables/useTheme", () => ({ useTheme: () => ({ isDark: { value: false }, themePalette: { value: "default" } }) })); vi.mock("@/composables/useToast", () => ({ useToast: () => ({ toast: mocks.toast }) })); +vi.mock("@/lib/backend/platform", () => ({ isMacOS: () => true })); +vi.mock("@/lib/backend/tauriRuntime", () => ({ isTauriRuntime: () => true })); vi.mock("@/lib/sql/sqlHighlighter", () => ({ createShikiSqlHighlighter: vi.fn(async () => (sql: string) => sql) })); vi.mock("@/lib/metadata/objectDdlCache", () => ({ loadObjectDdl: mocks.loadObjectDdl, @@ -309,10 +311,36 @@ function draft(isPrimaryKey = false, identity?: { seed: number; increment: numbe }; } +function draftWithColumns(count: number) { + const value = draft(); + value.columns = Array.from({ length: count }, (_, index) => ({ + id: `existing:field_${index}`, + name: `field_${index}`, + dataType: "varchar(255)", + isNullable: true, + defaultValue: "", + comment: "", + isPrimaryKey: false, + extra: {}, + original: { + name: `field_${index}`, + data_type: "varchar(255)", + is_nullable: true, + column_default: null, + is_primary_key: false, + extra: null, + comment: null, + }, + originalPosition: index, + markedForDrop: false, + })); + return value; +} + async function mountEditor( - databaseType: "sqlserver" | "postgres" | "sqlite" | "oracle" | "oceanbase-oracle" | "iris" | "dameng" | "duckdb" | "informix", + databaseType: "mysql" | "sqlserver" | "postgres" | "sqlite" | "oracle" | "oceanbase-oracle" | "iris" | "dameng" | "duckdb" | "informix" | "clickhouse", isPrimaryKey = false, - options: { database?: string; dynamicTypes?: string[]; identity?: { seed: number; increment: number }; tableName?: string; columnName?: string; foreignKeyRefTable?: string } = {}, + options: { database?: string; dynamicTypes?: string[]; identity?: { seed: number; increment: number }; tableName?: string; columnName?: string; foreignKeyRefTable?: string; draftOverride?: ReturnType; onDraftUpdate?: (value: unknown) => void } = {}, ) { mocks.connection.db_type = databaseType; mocks.connection.name = databaseType; @@ -328,7 +356,8 @@ async function mountEditor( database: options.database ?? "test", schema: "SYSDBA", tableName: options.tableName ?? "users", - draft: draft(isPrimaryKey, options.identity, options.columnName, options.foreignKeyRefTable), + draft: options.draftOverride ?? draft(isPrimaryKey, options.identity, options.columnName, options.foreignKeyRefTable), + "onUpdate:draft": options.onDraftUpdate, }); mountedApps.push(app); app.mount(root); @@ -748,26 +777,26 @@ describe("TableStructureEditor data type options", () => { }); describe("TableStructureEditor action column", () => { - it("moves delayed shortcut hints onto the add, copy, and delete controls", async () => { + it("keeps the add shortcut tooltip and exposes row shortcuts without per-row tooltip components", async () => { const root = await mountEditor("dameng"); expect(root.textContent).not.toContain("settings.shortcutsTab"); expect(root.querySelector("[data-field-shortcut-hints]")).toBeNull(); const addTooltip = root.querySelector("[data-add-column-shortcut-tooltip]"); - const copyTooltip = root.querySelector("[data-copy-column-shortcut-tooltip]"); - const deleteTooltip = root.querySelector("[data-delete-column-shortcut-tooltip]"); + const copyButton = root.querySelector("[data-copy-column-shortcut-button]"); + const deleteButton = root.querySelector("[data-delete-column-shortcut-button]"); expect(addTooltip?.getAttribute("delay-duration")).toBe("500"); - expect(copyTooltip?.getAttribute("delay-duration")).toBe("500"); - expect(deleteTooltip?.getAttribute("delay-duration")).toBe("500"); expect(root.querySelector("[data-add-column-shortcut-content]")?.textContent).toBe("Shift+Enter"); // The add control already renders its label, so that hint stays a bare shortcut. expect(root.querySelector("[data-add-column-shortcut-content]")?.textContent).not.toContain("structureEditor.addColumn"); - // The icon-only copy/delete controls must name the action next to the shortcut (#9870). - expect(root.querySelector("[data-copy-column-shortcut-content]")?.textContent).toBe("structureEditor.copyColumn⌘/Ctrl+D"); - expect(root.querySelector("[data-delete-column-shortcut-content]")?.textContent).toBe("structureEditor.drop⌘/Ctrl+Del"); - expect(copyTooltip?.querySelector("button")?.hasAttribute("title")).toBe(false); - expect(deleteTooltip?.querySelector("button")?.hasAttribute("title")).toBe(false); + // The icon-only copy/delete controls name the action next to the shortcut in native titles (#9870). + expect(root.querySelector("[data-copy-column-shortcut-tooltip]")).toBeNull(); + expect(root.querySelector("[data-delete-column-shortcut-tooltip]")).toBeNull(); + expect(copyButton?.getAttribute("title")).toBe("structureEditor.copyColumn ⌘/Ctrl+D"); + expect(copyButton?.getAttribute("aria-keyshortcuts")).toBe("Control+D Meta+D"); + expect(deleteButton?.getAttribute("title")).toBe("structureEditor.drop ⌘/Ctrl+Del"); + expect(deleteButton?.getAttribute("aria-keyshortcuts")).toBe("Control+Delete Meta+Delete"); }); it("names the delete control after the action it currently performs", async () => { @@ -776,13 +805,13 @@ describe("TableStructureEditor action column", () => { const persistedDelete = root.querySelector('button[aria-label="structureEditor.drop"]'); if (!persistedDelete) throw new Error("Missing delete button for the persisted column"); persistedDelete.click(); - await vi.waitFor(() => expect(root.querySelector("[data-delete-column-shortcut-content]")?.textContent).toBe("structureEditor.restore⌘/Ctrl+Del")); + await vi.waitFor(() => expect(root.querySelector("[data-delete-column-shortcut-button]")?.getAttribute("title")).toBe("structureEditor.restore")); buttonWithText(root, "structureEditor.addColumn").click(); await vi.waitFor(() => expect(root.querySelector('[data-column-row-index="1"]')).not.toBeNull()); const addedRow = root.querySelector('[data-column-row-index="1"]'); expect(addedRow?.querySelector('button[aria-label="structureEditor.remove"]')).not.toBeNull(); - expect(addedRow?.querySelector("[data-delete-column-shortcut-content]")?.textContent).toBe("structureEditor.remove⌘/Ctrl+Del"); + expect(addedRow?.querySelector("[data-delete-column-shortcut-button]")?.getAttribute("title")).toBe("structureEditor.remove ⌘/Ctrl+Del"); }); it("adds a field below the focused input on Shift+Enter", async () => { @@ -906,6 +935,7 @@ describe("TableStructureEditor horizontal scrolling", () => { const root = await mountEditor("postgres"); const scroller = root.querySelector(".structure-table-scroller"); if (!scroller) throw new Error("Missing structure table scroller"); + expect(scroller.classList.contains("flow-mode")).toBe(true); Object.defineProperties(scroller, { clientWidth: { configurable: true, value: 400 }, scrollWidth: { configurable: true, value: 1200 }, @@ -935,6 +965,128 @@ describe("TableStructureEditor horizontal scrolling", () => { }); describe("TableStructureEditor vertical scrolling", () => { + it.each(["mysql", "postgres", "sqlserver", "oracle", "sqlite", "dameng", "clickhouse"] as const)("virtualizes large %s field lists and moves the rendered window while scrolling", async (databaseType) => { + const root = await mountEditor(databaseType, false, { draftOverride: draftWithColumns(200) }); + const scroller = root.querySelector(".structure-table-scroller"); + if (!scroller) throw new Error("Missing structure table scroller"); + Object.defineProperties(scroller, { + clientHeight: { configurable: true, value: 330 }, + scrollHeight: { configurable: true, value: 6630 }, + scrollTop: { configurable: true, value: 0, writable: true }, + }); + + scroller.dispatchEvent(new Event("scroll")); + await nextTick(); + + expect(root.querySelectorAll("[data-column-row-index]").length).toBeLessThan(40); + expect(root.querySelector('[data-column-row-index="0"]')).not.toBeNull(); + expect(root.querySelector('[data-column-row-index="100"]')).toBeNull(); + + scroller.scrollTop = 3300; + scroller.dispatchEvent(new Event("scroll")); + await vi.waitFor(() => expect(root.querySelector('[data-column-row-index="100"][data-column-row-active="true"]')).not.toBeNull()); + + expect(root.querySelectorAll('[data-column-row-active="true"]')).not.toHaveLength(0); + }); + + it("keeps the shared context menu targeted to a recycled field row", async () => { + const root = await mountEditor("mysql", false, { draftOverride: draftWithColumns(200) }); + const scroller = root.querySelector(".structure-table-scroller"); + if (!scroller) throw new Error("Missing structure table scroller"); + Object.defineProperties(scroller, { + clientHeight: { configurable: true, value: 330 }, + scrollHeight: { configurable: true, value: 6630 }, + scrollTop: { configurable: true, value: 3300, writable: true }, + }); + + scroller.dispatchEvent(new Event("scroll")); + await vi.waitFor(() => expect(root.querySelector('[data-column-row-index="100"][data-column-row-active="true"]')).not.toBeNull()); + + const targetRow = root.querySelector('[data-column-row-index="100"]'); + targetRow?.dispatchEvent(new MouseEvent("contextmenu", { bubbles: true, button: 2, clientX: 20, clientY: 20 })); + await nextTick(); + + const contextMenu = document.body.querySelector("[data-dbx-context-menu]"); + if (!contextMenu) throw new Error("Missing shared column context menu"); + buttonWithText(contextMenu, "structureEditor.copyColumn").click(); + await vi.waitFor(() => expect(root.querySelector('[data-column-row-index="101"][data-new-column-row="true"]')).not.toBeNull()); + }); + + it("uses scheduled updates for small scrolls and synchronously catches jumps beyond the virtual buffer", async () => { + const root = await mountEditor("mysql", false, { draftOverride: draftWithColumns(200) }); + const scroller = root.querySelector(".structure-table-scroller"); + if (!scroller) throw new Error("Missing structure table scroller"); + Object.defineProperties(scroller, { + clientHeight: { configurable: true, value: 330 }, + scrollHeight: { configurable: true, value: 6630 }, + scrollTop: { configurable: true, value: 0, writable: true }, + }); + + const requestAnimationFrameSpy = vi.spyOn(window, "requestAnimationFrame").mockImplementation(() => 1); + try { + expect(root.querySelector('[data-column-row-index="30"]')).toBeNull(); + + scroller.scrollTop = 66; + scroller.dispatchEvent(new Event("scroll")); + await nextTick(); + expect(root.querySelector('[data-column-row-index="30"]')).toBeNull(); + + scroller.scrollTop = 660; + scroller.dispatchEvent(new Event("scroll")); + await nextTick(); + + expect(root.querySelector('[data-column-row-index="30"][data-column-row-active="true"]')).not.toBeNull(); + expect(root.querySelectorAll('[data-column-row-active="true"]')).not.toHaveLength(0); + } finally { + requestAnimationFrameSpy.mockRestore(); + } + }); + + it("virtualizes PostgreSQL geometry rows with precomputed item sizes", async () => { + const value = draftWithColumns(80); + value.columns[0].dataType = "geometry(GEOMETRY,4326)"; + value.columns[0].original!.data_type = "geometry(GEOMETRY,4326)"; + + const root = await mountEditor("postgres", false, { draftOverride: value }); + + expect(root.querySelectorAll("[data-column-row-index]").length).toBeLessThan(80); + expect(root.querySelector('[data-column-row-index="0"]')).not.toBeNull(); + }); + + it("persists rapid scroll events once after scrolling settles", async () => { + const onDraftUpdate = vi.fn(); + const root = await mountEditor("mysql", false, { draftOverride: draftWithColumns(200), onDraftUpdate }); + const scroller = root.querySelector(".structure-table-scroller"); + if (!scroller) throw new Error("Missing structure table scroller"); + Object.defineProperties(scroller, { + clientHeight: { configurable: true, value: 330 }, + scrollHeight: { configurable: true, value: 6630 }, + scrollTop: { configurable: true, value: 0, writable: true }, + }); + const baselineDraft = onDraftUpdate.mock.calls[onDraftUpdate.mock.calls.length - 1]?.[0] as ReturnType | undefined; + expect(baselineDraft).toBeDefined(); + onDraftUpdate.mockClear(); + vi.useFakeTimers(); + try { + for (const scrollTop of [300, 600, 900]) { + scroller.scrollTop = scrollTop; + scroller.dispatchEvent(new Event("scroll")); + } + await nextTick(); + expect(onDraftUpdate).not.toHaveBeenCalled(); + + vi.advanceTimersByTime(180); + await nextTick(); + + expect(onDraftUpdate).toHaveBeenCalledTimes(1); + expect(onDraftUpdate.mock.calls[0]?.[0]).toMatchObject({ scrollPositions: { columns: { scrollTop: 900, scrollLeft: 0 } } }); + expect(onDraftUpdate.mock.calls[0]?.[0].columns).toBe(baselineDraft?.columns); + expect(onDraftUpdate.mock.calls[0]?.[0].indexes).toBe(baselineDraft?.indexes); + } finally { + vi.useRealTimers(); + } + }); + it("shows a fixed scrollbar for overflowing fields and syncs thumb dragging", async () => { const root = await mountEditor("postgres"); const scroller = root.querySelector(".structure-table-scroller"); @@ -946,12 +1098,11 @@ describe("TableStructureEditor vertical scrolling", () => { }); scroller.dispatchEvent(new Event("scroll")); - await nextTick(); - await nextTick(); + await vi.waitFor(() => expect(root.querySelector(".structure-vertical-scrollbar__thumb")).not.toBeNull()); - const track = root.querySelector(".structure-vertical-scrollbar"); - const thumb = root.querySelector(".structure-vertical-scrollbar__thumb"); - if (!track || !thumb) throw new Error("Missing fixed vertical scrollbar"); + const track = root.querySelector(".structure-vertical-scrollbar")!; + const thumb = root.querySelector(".structure-vertical-scrollbar__thumb")!; + await vi.waitFor(() => expect(Number.parseFloat(thumb.style.height)).toBeCloseTo(25)); expect(Number.parseFloat(thumb.style.height)).toBeCloseTo(25); expect(Number.parseFloat(thumb.style.top)).toBeCloseTo(0); diff --git a/apps/desktop/src/components/structure/TableStructureEditor.vue b/apps/desktop/src/components/structure/TableStructureEditor.vue index 9013be198a..09b74067ca 100644 --- a/apps/desktop/src/components/structure/TableStructureEditor.vue +++ b/apps/desktop/src/components/structure/TableStructureEditor.vue @@ -5,6 +5,7 @@ import DdlStorageToggle from "@/components/objects/DdlStorageToggle.vue"; import { computed, nextTick, onActivated, onBeforeUnmount, onDeactivated, onMounted, ref, shallowRef, watch } from "vue"; import { uuid } from "@/lib/common/utils"; import { useI18n } from "vue-i18n"; +import { RecycleScroller } from "vue-virtual-scroller"; import { Button } from "@/components/ui/button"; import { Input } from "@/components/ui/input"; import { Badge } from "@/components/ui/badge"; @@ -37,7 +38,9 @@ import { copyToClipboard } from "@/lib/common/clipboard"; import DataGridCopyColumnNamesDialog from "@/components/grid/DataGridCopyColumnNamesDialog.vue"; import { formatSqlForDisplay, sqlFormatDialectForDbType, type SqlFormatDialect } from "@/lib/sql/sqlFormatter"; import { queryTimeoutSecsForConcurrentIndex, queryTimeoutSecsForConnection } from "@/lib/sql/queryTimeout"; +import { isMacOS } from "@/lib/backend/platform"; import { safeLocalStorageGet, safeLocalStorageSet } from "@/lib/backend/safeStorage"; +import { isTauriRuntime } from "@/lib/backend/tauriRuntime"; import { invalidateObjectDdl, loadObjectDdl } from "@/lib/metadata/objectDdlCache"; import { invalidateObjectMetadataCache, loadObjectMetadataFacet, type ObjectMetadataFacet } from "@/lib/metadata/objectMetadataCache"; import { invalidateTableMetadataCache } from "@/lib/metadata/tableMetadataCache"; @@ -138,7 +141,14 @@ const historyStore = useHistoryStore(); const settingsStore = useSettingsStore(); const { toast } = useToast(); const rootRef = ref(); -type StructureScrollerRef = HTMLElement | { $el?: HTMLElement }; +const useColumnVirtualFlowMode = isTauriRuntime() && isMacOS(); +type StructureScrollerRef = + | HTMLElement + | { + $el?: HTMLElement; + scrollToItem?: (index: number, options?: { align?: ScrollLogicalPosition }) => void; + updateVisibleItems?: (itemsChanged: boolean, checkPositionDiff?: boolean) => void; + }; const columnsScrollerRef = ref(); const indexesScrollerRef = ref(); const foreignKeysScrollerRef = ref(); @@ -147,10 +157,11 @@ const triggersScrollerRef = ref(); const partitionsScrollerRef = ref(); const ddlScrollerRef = ref(); const structureHorizontalScrollbarTrackRef = ref(); -const columnsTableRef = ref(null); const indexesTableRef = ref(null); const structureVerticalScrollbarTrackRef = ref(null); +const structureVerticalScrollbarThumbRef = ref(null); const structureHorizontalScrollbarThumbRef = ref(); +const columnContextMenuTarget = shallowRef(null); const hasStructureHorizontalOverflow = ref(false); const dynamicDataTypeOptionsCache = new Map(); @@ -196,16 +207,19 @@ const activeTab = ref("columns"); // horizontal bar. Render the same overlay affordance vertically for whichever // table tab is active; the bar occupies the tab panel's second grid column. const activeStructureTableScrollerRef = computed(() => structureScrollerElement(activeTab.value === "indexes" ? indexesScrollerRef.value : columnsScrollerRef.value) ?? null); -const activeStructureTableContentRef = computed(() => (activeTab.value === "indexes" ? indexesTableRef.value : columnsTableRef.value) ?? null); +const activeStructureTableContentRef = computed(() => { + if (activeTab.value === "indexes") return indexesTableRef.value ?? null; + const scroller = structureScrollerElement(columnsScrollerRef.value); + return scroller?.querySelector(".vue-recycle-scroller__item-wrapper") ?? scroller ?? null; +}); const { hasOverflow: hasStructureVerticalOverflow, isScrolling: isStructureVerticalScrollbarScrolling, isDragging: isStructureVerticalScrollbarDragging, - thumbStyle: structureVerticalScrollbarThumbStyle, onScroll: onStructureVerticalScrollerScroll, onTrackPointerDown: onStructureVerticalScrollbarTrackPointerDown, onThumbPointerDown: onStructureVerticalScrollbarThumbPointerDown, -} = useVerticalOverlayScrollbar(activeStructureTableScrollerRef, activeStructureTableContentRef, structureVerticalScrollbarTrackRef); +} = useVerticalOverlayScrollbar(activeStructureTableScrollerRef, activeStructureTableContentRef, structureVerticalScrollbarTrackRef, structureVerticalScrollbarThumbRef); const loading = ref(false); const saving = ref(false); const postSaveRefreshing = ref(false); @@ -895,6 +909,10 @@ const STRUCTURE_COLUMNS_WIDTHS_STORAGE_KEY = "dbx-structure-editor-column-widths const STRUCTURE_INDEX_COLUMNS_WIDTHS_STORAGE_KEY = "dbx-structure-editor-index-column-widths"; const STRUCTURE_SQL_PREVIEW_COLLAPSED_STORAGE_KEY = "dbx-structure-editor-sql-preview-collapsed"; const FIELD_SHORTCUT_TOOLTIP_DELAY_MS = 500; +const STRUCTURE_COLUMN_VIRTUAL_BUFFER_PX = 320; +const STRUCTURE_COLUMN_VIRTUAL_PRERENDER_ROWS = 24; +const STRUCTURE_COLUMN_SCROLL_INTERACTION_DELAY_MS = 120; +const STRUCTURE_SCROLL_DRAFT_SYNC_DELAY_MS = 180; const STRUCTURE_COLUMN_WIDTH_COUNT = 12; const STRUCTURE_INDEX_COLUMN_WIDTH_COUNT = 9; const PERSISTED_STRUCTURE_INDEX_COLUMN_WIDTHS = new Set([0, 1, 6]); @@ -1452,6 +1470,21 @@ const colLabels = computed(() => { } return labels; }); +const structureColumnRowHeight = computed(() => structureDensityMetric.value.controlHeight + structureDensityMetric.value.cellPaddingY * 2 + 1); +const columnTableWidth = computed(() => visibleColWidths.value.reduce((total, width) => total + width, 0)); +function columnNeedsVariableGeometryHeight(column: EditableStructureColumn): boolean { + return isPostgresGeometryDataType(databaseType.value, column.dataType) && !postgresGeometryTypeValue(column.dataType) && !!postgresGeometrySridValue(column.dataType); +} +const columnVirtualItemSize = computed(() => (columns.value.some(columnNeedsVariableGeometryHeight) ? null : structureColumnRowHeight.value)); +const columnVirtualRows = computed(() => { + const geometryHintHeight = Math.ceil(structureDensityMetric.value.fontSize * structureDensityMetric.value.lineHeight) + 2; + return columns.value.map((column, index) => ({ + id: column.id, + column, + index, + size: structureColumnRowHeight.value + (columnNeedsVariableGeometryHeight(column) ? geometryHintHeight : 0), + })); +}); const indexColLabels = computed(() => [ t("structureEditor.indexName"), t("structureEditor.indexColumns"), @@ -1608,7 +1641,10 @@ let syncingDraft = false; let draftHydrated = false; let lastAppliedInitialTabRequestId: number | undefined; let hydratingRestoredDraft = false; -let structureScrollFrame = 0; +let structureScrollDraftSyncTimer: ReturnType | undefined; +let structureColumnScrollingTimer: ReturnType | undefined; +let lastColumnVirtualRenderScrollTop = 0; +let lastSyncedDraft: TableStructureEditorDraft | undefined; let structureHorizontalScrollbarThumbLeftPercent = 0; let structureHorizontalScrollbarThumbWidthPercent = 100; let structureHorizontalScrollbarResizeObserver: ResizeObserver | null = null; @@ -1629,7 +1665,7 @@ function cloneDraftValue(value: T): T { return JSON.parse(JSON.stringify(value)) as T; } -const structureScrollPositions = ref>>({}); +let structureScrollPositions: Partial> = {}; function structureScrollerElement(scroller: StructureScrollerRef | undefined): HTMLElement | undefined { if (!scroller) return undefined; @@ -1685,7 +1721,9 @@ function observeStructureHorizontalScroller() { const scroller = activeStructureHorizontalScroller(); updateStructureHorizontalScrollbar(scroller); if (!scroller || typeof ResizeObserver === "undefined") return; - structureHorizontalScrollbarResizeObserver = new ResizeObserver(() => updateStructureHorizontalScrollbar(scroller)); + structureHorizontalScrollbarResizeObserver = new ResizeObserver(() => { + updateStructureHorizontalScrollbar(scroller); + }); structureHorizontalScrollbarResizeObserver.observe(scroller); for (const child of Array.from(scroller.children)) structureHorizontalScrollbarResizeObserver.observe(child); }); @@ -1746,7 +1784,7 @@ function startStructureHorizontalScrollbarDrag(event: PointerEvent) { } function restoreStructureScrollPosition(tab = activeTab.value) { - const position = structureScrollPositions.value[tab]; + const position = structureScrollPositions[tab]; if (!position) return; nextTick(() => { if (tab === "ddl" && ddlEditorView.value) { @@ -1762,9 +1800,54 @@ function restoreStructureScrollPosition(tab = activeTab.value) { }); } +function scheduleStructureScrollDraftSync() { + if (structureScrollDraftSyncTimer) clearTimeout(structureScrollDraftSyncTimer); + structureScrollDraftSyncTimer = setTimeout(() => { + structureScrollDraftSyncTimer = undefined; + syncStructureScrollDraftToParent(); + }, STRUCTURE_SCROLL_DRAFT_SYNC_DELAY_MS); +} + +function flushStructureScrollDraftSync() { + if (!structureScrollDraftSyncTimer) return; + clearTimeout(structureScrollDraftSyncTimer); + structureScrollDraftSyncTimer = undefined; + syncStructureScrollDraftToParent(); +} + +function updateColumnVirtualRowsDuringScroll(scroller: HTMLElement) { + const virtualScroller = columnsScrollerRef.value; + if (!virtualScroller || virtualScroller instanceof HTMLElement || structureScrollerElement(virtualScroller) !== scroller) return; + lastColumnVirtualRenderScrollTop = scroller.scrollTop; + virtualScroller.updateVisibleItems?.(false, true); +} + +function onColumnVirtualRowsUpdated() { + const scroller = structureScrollerElement(columnsScrollerRef.value); + if (scroller) lastColumnVirtualRenderScrollTop = scroller.scrollTop; +} + +function columnVirtualRowsNeedSynchronousUpdate(scroller: HTMLElement): boolean { + return Math.abs(scroller.scrollTop - lastColumnVirtualRenderScrollTop) >= STRUCTURE_COLUMN_VIRTUAL_BUFFER_PX; +} + +function markColumnVirtualScrollerScrolling(scroller: HTMLElement) { + scroller.classList.add("is-scrolling"); + if (structureColumnScrollingTimer) clearTimeout(structureColumnScrollingTimer); + structureColumnScrollingTimer = window.setTimeout(() => { + structureColumnScrollingTimer = undefined; + scroller.classList.remove("is-scrolling"); + updateColumnVirtualRowsDuringScroll(scroller); + }, STRUCTURE_COLUMN_SCROLL_INTERACTION_DELAY_MS); +} + function onStructureContentScroll(tab: TableInfoTab, event: Event) { const target = event.currentTarget; if (!(target instanceof HTMLElement)) return; + if (tab === "columns") { + markColumnVirtualScrollerScrolling(target); + if (columnVirtualRowsNeedSynchronousUpdate(target)) updateColumnVirtualRowsDuringScroll(target); + } if (tab === "columns" || tab === "indexes") { updateStructureHorizontalScrollbar(target); if (activeTab.value === tab) onStructureVerticalScrollerScroll(); @@ -1773,17 +1856,10 @@ function onStructureContentScroll(tab: TableInfoTab, event: Event) { scrollTop: Math.max(0, Math.round(target.scrollTop)), scrollLeft: Math.max(0, Math.round(target.scrollLeft)), }; - const previous = structureScrollPositions.value[tab]; + const previous = structureScrollPositions[tab]; if (previous?.scrollTop === position.scrollTop && previous.scrollLeft === position.scrollLeft) return; - structureScrollPositions.value = { - ...structureScrollPositions.value, - [tab]: position, - }; - if (structureScrollFrame) return; - structureScrollFrame = window.requestAnimationFrame(() => { - structureScrollFrame = 0; - syncDraftToParent(); - }); + structureScrollPositions[tab] = position; + scheduleStructureScrollDraftSync(); } function createCurrentDraft(initialized = true): TableStructureEditorDraft { @@ -1818,21 +1894,46 @@ function createCurrentDraft(initialized = true): TableStructureEditorDraft { createPartitioningColumns: cloneDraftValue(createPartitioningColumns.value), createPartitioningExpression: createPartitioningExpression.value, loadedMetadataFacets: [...loadedMetadataFacets], - scrollPositions: cloneDraftValue(structureScrollPositions.value), + scrollPositions: cloneDraftValue(structureScrollPositions), appliedInitialTabRequestId: lastAppliedInitialTabRequestId, initialized, }; } +function emitDraftToParent(draft: TableStructureEditorDraft | undefined) { + lastSyncedDraft = draft; + emit("update:draft", draft); +} + +function syncStructureScrollDraftToParent() { + if (!draftHydrated || restoringDraft || syncingDraft) return; + const draft = lastSyncedDraft ?? props.draft; + if (!draft) { + syncDraftToParent(); + return; + } + emitDraftToParent({ + ...draft, + activeTab: activeTab.value as TableStructureEditorDraft["activeTab"], + scrollPositions: cloneDraftValue(structureScrollPositions), + appliedInitialTabRequestId: lastAppliedInitialTabRequestId, + }); +} + function syncDraftToParent() { + if (structureScrollDraftSyncTimer) { + clearTimeout(structureScrollDraftSyncTimer); + structureScrollDraftSyncTimer = undefined; + } if (!draftHydrated) return; if (restoringDraft || syncingDraft) return; syncingDraft = true; - emit("update:draft", createCurrentDraft()); + emitDraftToParent(createCurrentDraft()); syncingDraft = false; } function restoreDraft(draft: TableStructureEditorDraft) { + lastSyncedDraft = draft; restoringDraft = true; draftHydrated = false; lastAppliedInitialTabRequestId = draft.appliedInitialTabRequestId; @@ -1888,7 +1989,7 @@ function restoreDraft(draft: TableStructureEditorDraft) { if (activeScope.triggers || triggersLoaded.value) loadedMetadataFacets.add("triggers"); if (activeScope.tableComment) loadedMetadataFacets.add("comment"); } - structureScrollPositions.value = cloneDraftValue(draft.scrollPositions || {}); + structureScrollPositions = cloneDraftValue(draft.scrollPositions || {}); restoringDraft = false; draftHydrated = !needsColumnDraftMetadataHydration(); restoreStructureScrollPosition(); @@ -2252,7 +2353,7 @@ const canApply = computed( function clearDraft() { draftHydrated = false; - emit("update:draft", undefined); + emitDraftToParent(undefined); } function resetState() { @@ -2830,11 +2931,28 @@ async function refreshStructureAfterSave(scope: TableStructureRefreshScope, char } } -async function focusColumnNameInput(columnId: string) { +function renderedColumnRow(index: number): HTMLElement | undefined { + return rootRef.value?.querySelector(`[data-column-row-index="${index}"]`) ?? undefined; +} + +async function scrollColumnRowIntoView(index: number, block: ScrollLogicalPosition = "nearest"): Promise { await nextTick(); - const row = Array.from(rootRef.value?.querySelectorAll("[data-column-row-index]") ?? []).find((element) => element.dataset.columnId === columnId); + let row = renderedColumnRow(index); + if (!row) { + const virtualScroller = columnsScrollerRef.value; + if (virtualScroller && !(virtualScroller instanceof HTMLElement)) virtualScroller.scrollToItem?.(index, { align: block }); + await nextTick(); + row = renderedColumnRow(index); + } + row?.scrollIntoView({ block, inline: "nearest" }); + return row; +} + +async function focusColumnNameInput(columnId: string) { + const index = columns.value.findIndex((column) => column.id === columnId); + if (index < 0) return; + const row = await scrollColumnRowIntoView(index); const input = row?.querySelector("[data-column-name-input]"); - row?.scrollIntoView({ block: "nearest" }); input?.focus(); input?.select(); } @@ -3463,7 +3581,8 @@ function columnDragInsertionIndexFromPoint(clientY: number): number | null { const rows = Array.from(rootRef.value?.querySelectorAll("[data-column-row-index]") ?? []); if (!rows.length) return null; const firstRect = rows[0].getBoundingClientRect(); - if (clientY < firstRect.top) return 0; + const firstIndex = Number(rows[0].dataset.columnRowIndex); + if (clientY < firstRect.top) return Number.isInteger(firstIndex) ? firstIndex : 0; for (const row of rows) { const rowIndex = Number(row.dataset.columnRowIndex); if (!Number.isInteger(rowIndex)) continue; @@ -3472,7 +3591,8 @@ function columnDragInsertionIndexFromPoint(clientY: number): number | null { return clientY > rect.top + rect.height / 2 ? rowIndex + 1 : rowIndex; } } - return rows.length; + const lastIndex = Number(rows[rows.length - 1]?.dataset.columnRowIndex); + return Number.isInteger(lastIndex) ? lastIndex + 1 : rows.length; } function onColumnDragStart(index: number, event: DragEvent) { @@ -3574,13 +3694,12 @@ function scrollToColumnSearchMatch(direction: 1 | -1 = 1) { focusColumnSearch(); return; } - const rows = Array.from(rootRef.value?.querySelectorAll("[data-column-row-index]") ?? []); const matches = columns.value.map((column, index) => ({ column, index })).filter(({ column }) => columnMatchesSearch(column)); if (!matches.length) return; const currentIndex = highlightedColumnId.value ? matches.findIndex(({ column }) => column.id === highlightedColumnId.value) : -1; const nextMatch = matches[(currentIndex + direction + matches.length) % matches.length] ?? matches[0]; highlightedColumnId.value = nextMatch.column.id; - rows[nextMatch.index]?.scrollIntoView({ block: "center", inline: "nearest" }); + void scrollColumnRowIntoView(nextMatch.index, "center"); if (columnHighlightTimer) window.clearTimeout(columnHighlightTimer); columnHighlightTimer = window.setTimeout(() => { highlightedColumnId.value = null; @@ -3735,7 +3854,7 @@ async function copyColumnRows(targets: EditableStructureColumn[]) { /** Batch drop: new rows are removed outright, existing rows are marked for drop. */ function dropOrRemoveColumns(targets: EditableStructureColumn[]) { - for (const column of [...targets]) { + for (const column of targets) { if (column.original) { if (!column.markedForDrop) toggleDropColumn(column); } else { @@ -3785,6 +3904,21 @@ function deleteColumnActionLabel(column: EditableStructureColumn): string { return column.markedForDrop ? t("structureEditor.restore") : t("structureEditor.drop"); } +function activeColumnContextMenuItems(): ContextMenuItem[] { + const column = columnContextMenuTarget.value; + return column ? columnContextMenuItems(column) : []; +} + +function openColumnContextMenu(event: MouseEvent, column: EditableStructureColumn, openContextMenu: (event: MouseEvent, itemsOverride?: ContextMenuItem[]) => void) { + const items = columnContextMenuItems(column); + columnContextMenuTarget.value = column; + openContextMenu(event, items); +} + +function clearColumnContextMenuTarget() { + columnContextMenuTarget.value = null; +} + function isColumnNameDisabled(column: EditableStructureColumn): boolean { return column.markedForDrop || (!!column.original && !structureCapabilities.value.renameColumn); } @@ -4485,6 +4619,9 @@ onActivated(() => { if (activeTab.value === "ddl") scheduleDdlEditorInit(); }); onDeactivated(() => { + flushStructureScrollDraftSync(); + if (structureColumnScrollingTimer) clearTimeout(structureColumnScrollingTimer); + structureColumnScrollingTimer = undefined; unregisterStructureEditorShortcuts(); structureHorizontalScrollbarObserverGeneration += 1; structureHorizontalScrollbarResizeObserver?.disconnect(); @@ -4493,6 +4630,9 @@ onDeactivated(() => { destroyDdlEditor(); }); onBeforeUnmount(() => { + flushStructureScrollDraftSync(); + if (structureColumnScrollingTimer) clearTimeout(structureColumnScrollingTimer); + structureColumnScrollingTimer = undefined; clearCopySourceTableSearchTimer(); if (partitionDialogSqlTimer) clearTimeout(partitionDialogSqlTimer); stopColumnDragTracking(); @@ -4504,7 +4644,6 @@ onBeforeUnmount(() => { clearSqlPreviewState(); if (columnHighlightTimer) window.clearTimeout(columnHighlightTimer); if (indexHighlightTimer) window.clearTimeout(indexHighlightTimer); - if (structureScrollFrame) window.cancelAnimationFrame(structureScrollFrame); persistStructureDensity(); }); @@ -4975,466 +5114,520 @@ watch( - - - - - - - - - - - - - -
- - -
-
-
-
- {{ index + 1 }} - -
-
- - - - - - - {{ t("structureEditor.copyColumn") }} - ⌘/Ctrl+D - - - - - - - - - {{ deleteColumnActionLabel(column) }} - ⌘/Ctrl+Del - - -
-
-
- - - - - - - - - - -
- {{ t("structureEditor.enumValues") }} - -
-
-
- - + + + + +