Skip to content

fix: file picker appears behind connection form window #588

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
Apr 6, 2026
Merged

fix: file picker appears behind connection form window #588

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
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

### Fixed

- File picker dialog appears behind the connection form window

### Added

- iOS: connection groups and tags
Expand Down
2 changes: 0 additions & 2 deletions TablePro/AppDelegate+WindowConfig.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,8 +203,6 @@ extension AppDelegate {

window.collectionBehavior.remove(.fullScreenPrimary)
window.collectionBehavior.insert(.fullScreenNone)

window.level = .floating
}

// MARK: - Welcome Window Suppression
Expand Down
3 changes: 2 additions & 1 deletion TablePro/Views/Connection/ConnectionFormView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1155,12 +1155,13 @@ struct ConnectionFormView: View {
}

private func browseForFile() {
guard let window = NSApp.keyWindow else { return }
let panel = NSOpenPanel()
panel.allowedContentTypes = [.database, .data]
panel.allowsMultipleSelection = false
panel.canChooseDirectories = false

panel.begin { response in
panel.beginSheetModal(for: window) { response in
if response == .OK, let url = panel.url {
database = url.path(percentEncoded: false)
}
Expand Down
6 changes: 4 additions & 2 deletions TablePro/Views/Connection/ConnectionSSHTunnelView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -335,29 +335,31 @@ struct ConnectionSSHTunnelView: View {
// MARK: - Helper Methods

private func browseForPrivateKey() {
guard let window = NSApp.keyWindow else { return }
let panel = NSOpenPanel()
panel.allowsMultipleSelection = false
panel.canChooseDirectories = false
panel.directoryURL = FileManager.default.homeDirectoryForCurrentUser.appendingPathComponent(
".ssh")
panel.showsHiddenFiles = true

panel.begin { response in
panel.beginSheetModal(for: window) { response in
if response == .OK, let url = panel.url {
sshPrivateKeyPath = url.path(percentEncoded: false)
}
}
}

private func browseForJumpHostKey(jumpHost: Binding<SSHJumpHost>) {
guard let window = NSApp.keyWindow else { return }
let panel = NSOpenPanel()
panel.allowsMultipleSelection = false
panel.canChooseDirectories = false
panel.directoryURL = FileManager.default.homeDirectoryForCurrentUser.appendingPathComponent(
".ssh")
panel.showsHiddenFiles = true

panel.begin { response in
panel.beginSheetModal(for: window) { response in
if response == .OK, let url = panel.url {
jumpHost.wrappedValue.privateKeyPath = url.path(percentEncoded: false)
}
Expand Down
3 changes: 2 additions & 1 deletion TablePro/Views/Connection/ConnectionSSLView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,13 +76,14 @@ struct ConnectionSSLView: View {
}

private func browseForCertificate(binding: Binding<String>) {
guard let window = NSApp.keyWindow else { return }
let panel = NSOpenPanel()
panel.allowsMultipleSelection = false
panel.canChooseDirectories = false
panel.allowedContentTypes = [.data]
panel.showsHiddenFiles = true

panel.begin { response in
panel.beginSheetModal(for: window) { response in
if response == .OK, let url = panel.url {
binding.wrappedValue = url.path(percentEncoded: false)
}
Expand Down
6 changes: 4 additions & 2 deletions TablePro/Views/Connection/SSHProfileEditorView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -510,25 +510,27 @@ struct SSHProfileEditorView: View {
}

private func browseForPrivateKey() {
guard let window = NSApp.keyWindow else { return }
let panel = NSOpenPanel()
panel.allowsMultipleSelection = false
panel.canChooseDirectories = false
panel.directoryURL = FileManager.default.homeDirectoryForCurrentUser.appendingPathComponent(".ssh")
panel.showsHiddenFiles = true
panel.begin { response in
panel.beginSheetModal(for: window) { response in
if response == .OK, let url = panel.url {
privateKeyPath = url.path(percentEncoded: false)
}
}
}

private func browseForJumpHostKey(jumpHost: Binding<SSHJumpHost>) {
guard let window = NSApp.keyWindow else { return }
let panel = NSOpenPanel()
panel.allowsMultipleSelection = false
panel.canChooseDirectories = false
panel.directoryURL = FileManager.default.homeDirectoryForCurrentUser.appendingPathComponent(".ssh")
panel.showsHiddenFiles = true
panel.begin { response in
panel.beginSheetModal(for: window) { response in
if response == .OK, let url = panel.url {
jumpHost.wrappedValue.privateKeyPath = url.path(percentEncoded: false)
}
Expand Down
Loading