diff --git a/apps/desktop/src/components/grid/DataGrid.vue b/apps/desktop/src/components/grid/DataGrid.vue index 836ca088b7..88b66f577b 100644 --- a/apps/desktop/src/components/grid/DataGrid.vue +++ b/apps/desktop/src/components/grid/DataGrid.vue @@ -2095,6 +2095,17 @@ const goToColumnOpen = ref(false); const goToColumnSearch = ref(""); const goToColumnSearchInput = ref(); const goToColumnListRef = ref(); +// The trigger lives inside a Tooltip so the icon keeps its hover hint, and that +// tooltip claims the popper anchor for its own popper root. Pointing the popover at +// the button element directly keeps the column list positioned on screen. +const goToColumnTriggerRef = ref(); + +function goToColumnTriggerElement(): HTMLElement | undefined { + const trigger = goToColumnTriggerRef.value; + if (!trigger) return undefined; + return trigger instanceof HTMLElement ? trigger : trigger.$el; +} + const goToColumnSelectedIndex = ref(0); const columnOrderKeys = computed(() => uniqueDataGridColumnOrderKeys(props.result.columns, props.sourceColumns)); const resolvedColumnLayoutScopeKey = computed( @@ -12556,7 +12567,7 @@ useUpdateBlocker(() => (hasPendingChanges.value || hasPendingDataEditorDraft.val -