Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
50 changes: 50 additions & 0 deletions src/__tests__/skills-index.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,56 @@ describe('SkillsIndex', () => {
})
})

it('switches browse default sorting back to relevance when entering search', async () => {
searchMock = { sort: 'downloads' }
vi.useFakeTimers()

render(<SkillsIndex />)

const input = screen.getByPlaceholderText('Filter by name, slug, or summary…')
await act(async () => {
fireEvent.change(input, { target: { value: 'cli-design-framework' } })
await vi.runAllTimersAsync()
})

expect(navigateMock).toHaveBeenCalled()
const lastCall = navigateMock.mock.calls.at(-1)?.[0] as {
replace?: boolean
search: (prev: Record<string, unknown>) => Record<string, unknown>
}
expect(lastCall.replace).toBe(true)
expect(lastCall.search({ sort: 'downloads' })).toEqual({
q: 'cli-design-framework',
sort: undefined,
dir: undefined,
})
})

it('preserves explicitly user-set downloads sort when entering search', async () => {
searchMock = { sort: 'downloads', dir: 'desc' }
vi.useFakeTimers()

render(<SkillsIndex />)

const input = screen.getByPlaceholderText('Filter by name, slug, or summary…')
await act(async () => {
fireEvent.change(input, { target: { value: 'cli-design-framework' } })
await vi.runAllTimersAsync()
})

expect(navigateMock).toHaveBeenCalled()
const lastCall = navigateMock.mock.calls.at(-1)?.[0] as {
replace?: boolean
search: (prev: Record<string, unknown>) => Record<string, unknown>
}
expect(lastCall.replace).toBe(true)
expect(lastCall.search({ sort: 'downloads', dir: 'desc' })).toEqual({
q: 'cli-design-framework',
sort: 'downloads',
dir: 'desc',
})
})

it('loads more results when search pagination is requested', async () => {
searchMock = { q: 'remind' }
vi.stubGlobal('IntersectionObserver', undefined)
Expand Down
17 changes: 16 additions & 1 deletion src/routes/skills/-useSkillsBrowseModel.ts
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,22 @@ export function useSkillsBrowseModel({
const trimmed = next.trim()
navigateTimer.current = window.setTimeout(() => {
void navigate({
search: (prev) => ({ ...prev, q: trimmed ? next : undefined }),
search: (prev) => {
const hadQuery = typeof prev.q === 'string' && prev.q.trim().length > 0
const enteringSearch = Boolean(trimmed) && !hadQuery
const usesImplicitBrowseDefault = prev.sort === 'downloads' && prev.dir === undefined

return {
...prev,
q: trimmed ? next : undefined,
...(enteringSearch && usesImplicitBrowseDefault
? {
sort: undefined,
dir: undefined,
}
: null),
}
},
replace: true,
})
}, 220)
Expand Down