Skip to content

fix: position popovers using table view geometry instead of cell view bounds #211

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
datlechin merged 1 commit into from
Mar 9, 2026
Merged

fix: position popovers using table view geometry instead of cell view bounds #211

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions TablePro/Views/Results/DataGridView+TypePicker.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,16 @@ extension TableViewCoordinator {
column: Int,
columnIndex: Int
) {
guard let cellView = tableView.view(atColumn: column, row: row, makeIfNecessary: false),
guard tableView.view(atColumn: column, row: row, makeIfNecessary: false) != nil,
let rowData = rowProvider.row(at: row) else { return }

let currentValue = rowData.value(at: columnIndex) ?? ""
let dbType = databaseType ?? .mysql

let cellRect = tableView.rect(ofRow: row).intersection(tableView.rect(ofColumn: column))
PopoverPresenter.show(
relativeTo: cellView.bounds,
of: cellView
relativeTo: cellRect,
of: tableView
) { [weak self] dismiss in
TypePickerContentView(
databaseType: dbType,
Expand Down
41 changes: 23 additions & 18 deletions TablePro/Views/Results/Extensions/DataGridView+Popovers.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,12 @@ extension TableViewCoordinator {
let currentValue = rowData.value(at: columnIndex)
let columnType = rowProvider.columnTypes[columnIndex]

guard let cellView = tableView.view(atColumn: column, row: row, makeIfNecessary: false) else { return }
guard tableView.view(atColumn: column, row: row, makeIfNecessary: false) != nil else { return }

let cellRect = tableView.rect(ofRow: row).intersection(tableView.rect(ofColumn: column))
DatePickerPopoverController.shared.show(
relativeTo: cellView.bounds,
of: cellView,
relativeTo: cellRect,
of: tableView,
value: currentValue,
columnType: columnType
) { [weak self] newValue in
Expand Down Expand Up @@ -48,12 +49,13 @@ extension TableViewCoordinator {
guard let rowData = rowProvider.row(at: row) else { return }
let currentValue = rowData.value(at: columnIndex)

guard let cellView = tableView.view(atColumn: column, row: row, makeIfNecessary: false) else { return }
guard tableView.view(atColumn: column, row: row, makeIfNecessary: false) != nil else { return }
guard let databaseType, let connectionId else { return }

let cellRect = tableView.rect(ofRow: row).intersection(tableView.rect(ofColumn: column))
PopoverPresenter.show(
relativeTo: cellView.bounds,
of: cellView,
relativeTo: cellRect,
of: tableView,
contentSize: NSSize(width: 420, height: 320)
) { [weak self] dismiss in
ForeignKeyPopoverContentView(
Expand All @@ -79,11 +81,12 @@ extension TableViewCoordinator {
guard let rowData = rowProvider.row(at: row) else { return }
let currentValue = rowData.value(at: columnIndex)

guard let cellView = tableView.view(atColumn: column, row: row, makeIfNecessary: false) else { return }
guard tableView.view(atColumn: column, row: row, makeIfNecessary: false) != nil else { return }

let cellRect = tableView.rect(ofRow: row).intersection(tableView.rect(ofColumn: column))
PopoverPresenter.show(
relativeTo: cellView.bounds,
of: cellView,
relativeTo: cellRect,
of: tableView,
contentSize: NSSize(width: 420, height: 340)
) { [weak self] dismiss in
JSONEditorContentView(
Expand All @@ -103,7 +106,7 @@ extension TableViewCoordinator {
}

func showEnumPopover(tableView: NSTableView, row: Int, column: Int, columnIndex: Int) {
guard let cellView = tableView.view(atColumn: column, row: row, makeIfNecessary: false),
guard tableView.view(atColumn: column, row: row, makeIfNecessary: false) != nil,
let rowData = rowProvider.row(at: row) else { return }
let columnName = rowProvider.columns[columnIndex]
guard let allowedValues = rowProvider.columnEnumValues[columnName] else { return }
Expand All @@ -117,9 +120,10 @@ extension TableViewCoordinator {
}
values.append(contentsOf: allowedValues)

let cellRect = tableView.rect(ofRow: row).intersection(tableView.rect(ofColumn: column))
PopoverPresenter.show(
relativeTo: cellView.bounds,
of: cellView
relativeTo: cellRect,
of: tableView
) { [weak self] dismiss in
EnumPopoverContentView(
allValues: values,
Expand All @@ -134,7 +138,7 @@ extension TableViewCoordinator {
}

func showSetPopover(tableView: NSTableView, row: Int, column: Int, columnIndex: Int) {
guard let cellView = tableView.view(atColumn: column, row: row, makeIfNecessary: false),
guard tableView.view(atColumn: column, row: row, makeIfNecessary: false) != nil,
let rowData = rowProvider.row(at: row) else { return }
let columnName = rowProvider.columns[columnIndex]
guard let allowedValues = rowProvider.columnEnumValues[columnName] else { return }
Expand All @@ -152,9 +156,10 @@ extension TableViewCoordinator {
selections[value] = currentSet.contains(value)
}

let cellRect = tableView.rect(ofRow: row).intersection(tableView.rect(ofColumn: column))
PopoverPresenter.show(
relativeTo: cellView.bounds,
of: cellView
relativeTo: cellRect,
of: tableView
) { [weak self] dismiss in
SetPopoverContentView(
allowedValues: allowedValues,
Expand All @@ -168,7 +173,7 @@ extension TableViewCoordinator {
}

func showDropdownMenu(tableView: NSTableView, row: Int, column: Int, columnIndex: Int) {
guard let cellView = tableView.view(atColumn: column, row: row, makeIfNecessary: false),
guard tableView.view(atColumn: column, row: row, makeIfNecessary: false) != nil,
let rowData = rowProvider.row(at: row) else { return }

let currentValue = rowData.value(at: columnIndex)
Expand All @@ -185,8 +190,8 @@ extension TableViewCoordinator {
menu.addItem(item)
}

let cellRect = cellView.bounds
menu.popUp(positioning: nil, at: NSPoint(x: cellRect.minX, y: cellRect.maxY), in: cellView)
let cellRect = tableView.rect(ofRow: row).intersection(tableView.rect(ofColumn: column))
menu.popUp(positioning: nil, at: NSPoint(x: cellRect.minX, y: cellRect.maxY), in: tableView)
}

@objc func dropdownMenuItemSelected(_ sender: NSMenuItem) {
Expand Down