Skip to content

nightshift/bug: drag-reorder has no effect — filtered() always sorts by useCount #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

Open
perandre wants to merge 1 commit into
base: main
Choose a base branch
from
Open

nightshift/bug: drag-reorder has no effect — filtered() always sorts by useCount #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
16 changes: 10 additions & 6 deletions Sources/SnippetStore.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,13 +113,17 @@ class SnippetStore: ObservableObject {
}

func filtered(by query: String) -> [Snippet] {
let sorted = snippets.sorted { $0.useCount > $1.useCount }
guard !query.isEmpty else { return sorted }
// When there is no search query, honour the stored order so that
// manual drag-reordering (via move(from:to:)) is visible to the user.
// When filtering, sort by useCount so the most-used matches rise first.
guard !query.isEmpty else { return snippets }
let q = query.lowercased()
return sorted.filter {
$0.title.lowercased().contains(q) ||
$0.value.lowercased().contains(q)
}
return snippets
.filter {
$0.title.lowercased().contains(q) ||
$0.value.lowercased().contains(q)
}
.sorted { $0.useCount > $1.useCount }
}

func move(from source: IndexSet, to destination: Int) {
Expand Down