Skip to content

Allow reordering non-name table columns #2

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
lyc280705 merged 1 commit into from
Jul 10, 2026
Merged

Allow reordering non-name table columns #2

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
30 changes: 28 additions & 2 deletions work/CleanZipBuild/src/main.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -889,6 +889,7 @@ struct ArchiveEntriesTable: NSViewRepresentable {

final class Coordinator: NSObject, NSTableViewDataSource, NSTableViewDelegate {
var entries: [ArchiveEntry]
private var isRestoringFirstColumn = false
init(entries: [ArchiveEntry]) { self.entries = entries }
func numberOfRows(in tableView: NSTableView) -> Int { entries.count }

Expand Down Expand Up @@ -989,11 +990,23 @@ struct ArchiveEntriesTable: NSViewRepresentable {

func tableViewColumnDidMove(_ notification: Notification) {
guard let tableView = notification.object as? NSTableView else { return }
restoreFirstColumn(in: tableView, identifier: "name")
(tableView.enclosingScrollView as? FinderTableScrollView)?.rebalanceColumnsToViewport()
}

func tableView(_ tableView: NSTableView, shouldReorderColumn columnIndex: Int, toColumn newColumnIndex: Int) -> Bool {
columnIndex > 0 && newColumnIndex > 0
guard tableView.tableColumns.indices.contains(columnIndex) else { return false }
return tableView.tableColumns[columnIndex].identifier.rawValue != "name"
}

private func restoreFirstColumn(in tableView: NSTableView, identifier: String) {
guard !isRestoringFirstColumn else { return }
let columnIndex = tableView.column(withIdentifier: NSUserInterfaceItemIdentifier(identifier))
guard columnIndex > 0 else { return }

isRestoringFirstColumn = true
tableView.moveColumn(columnIndex, toColumn: 0)
isRestoringFirstColumn = false
}
}

Expand Down Expand Up @@ -1054,6 +1067,7 @@ struct SelectedItemsTable: NSViewRepresentable {
var items: [SelectedItem]
var selectedIDs: Binding<Set<String>>
private var isApplyingSelection = false
private var isRestoringFirstColumn = false

init(items: [SelectedItem], selectedIDs: Binding<Set<String>>) {
self.items = items
Expand Down Expand Up @@ -1096,11 +1110,23 @@ struct SelectedItemsTable: NSViewRepresentable {

func tableViewColumnDidMove(_ notification: Notification) {
guard let tableView = notification.object as? NSTableView else { return }
restoreFirstColumn(in: tableView, identifier: "selectedName")
(tableView.enclosingScrollView as? FinderTableScrollView)?.rebalanceColumnsToViewport()
}

func tableView(_ tableView: NSTableView, shouldReorderColumn columnIndex: Int, toColumn newColumnIndex: Int) -> Bool {
columnIndex > 0 && newColumnIndex > 0
guard tableView.tableColumns.indices.contains(columnIndex) else { return false }
return tableView.tableColumns[columnIndex].identifier.rawValue != "selectedName"
}

private func restoreFirstColumn(in tableView: NSTableView, identifier: String) {
guard !isRestoringFirstColumn else { return }
let columnIndex = tableView.column(withIdentifier: NSUserInterfaceItemIdentifier(identifier))
guard columnIndex > 0 else { return }

isRestoringFirstColumn = true
tableView.moveColumn(columnIndex, toColumn: 0)
isRestoringFirstColumn = false
}

func applySelection(to tableView: NSTableView) {
Expand Down
Loading