From 1b0c1fe3844b602afca3fd65736e05e56c3830e5 Mon Sep 17 00:00:00 2001 From: Ryan Wang Date: Fri, 13 Nov 2026 13:04:01 +0800 Subject: [PATCH 1/2] Add provider rail to the model selector --- ui/src/formkit/AiModelSelector.test.ts | 54 ++++++ ui/src/formkit/AiModelSelector.vue | 234 ++++++++++++++++++++----- 2 files changed, 243 insertions(+), 45 deletions(-) diff --git a/ui/src/formkit/AiModelSelector.test.ts b/ui/src/formkit/AiModelSelector.test.ts index 8be9dffc..882db69b 100644 --- a/ui/src/formkit/AiModelSelector.test.ts +++ b/ui/src/formkit/AiModelSelector.test.ts @@ -105,6 +105,7 @@ describe('AiModelSelector', () => { expect(getOptions()).toHaveLength(1) expect(getOptions()[0]?.textContent).toContain('DeepSeek Chat') expect(document.body.textContent).toContain('DeepSeek (深度求索 DeepSeek)') + expect(getProviderButton('OpenAI Production (OpenAI)')).not.toBeNull() await pressSearchKey('Escape') await openSelector(wrapper) @@ -118,6 +119,45 @@ describe('AiModelSelector', () => { ]) }) + it('filters models by provider from the rail and resets after closing', async () => { + const wrapper = mountSelector({ searchPlaceholder: '搜索模型...' }) + await openSelector(wrapper) + await clickProviderFilter('OpenAI Production (OpenAI)') + + expect(getOptions().map((option) => option.textContent)).toEqual([ + expect.stringContaining('GPT-4o'), + expect.stringContaining('Disabled Model'), + ]) + expect(document.body.textContent).toContain('OpenAI Production (OpenAI)') + expect(getProviderButton('OpenAI Production (OpenAI)')?.getAttribute('aria-pressed')).toBe( + 'true', + ) + + await pressSearchKey('Escape') + await openSelector(wrapper) + + expect(getOptions()).toHaveLength(3) + expect(getProviderButton('全部供应商')?.getAttribute('aria-pressed')).toBe('true') + }) + + it('keeps the provider rail when a search has no matches', async () => { + const wrapper = mountSelector({ searchPlaceholder: '搜索模型...' }) + + await openSelector(wrapper) + await searchFor('no-such-model') + + expect(getOptions()).toHaveLength(0) + expect(document.body.textContent).toContain('未找到匹配模型') + expect(getProviderButton('DeepSeek (深度求索 DeepSeek)')).not.toBeNull() + + await clickProviderFilter('DeepSeek (深度求索 DeepSeek)') + + expect(document.body.textContent).toContain('未找到匹配模型') + expect(getProviderButton('DeepSeek (深度求索 DeepSeek)')?.getAttribute('aria-pressed')).toBe( + 'true', + ) + }) + it('renders unavailable models without allowing selection', async () => { const wrapper = mountSelector() @@ -193,6 +233,7 @@ function mountSelector(props: Record = {}) { attachTo: document.body, global: { plugins: [router], + directives: { tooltip: {} }, }, props: { ...props, @@ -253,6 +294,19 @@ function getOptions() { return Array.from(document.querySelectorAll('[role="option"]')) } +function getProviderButton(label: string) { + return document.querySelector(`button[aria-label="${label}"]`) +} + +async function clickProviderFilter(label: string) { + const button = getProviderButton(label) + if (!button) { + throw new Error(`Expected provider filter ${label} to be rendered`) + } + button.dispatchEvent(new MouseEvent('click', { bubbles: true })) + await flushPromises() +} + async function dispatchPointerEvent(element: HTMLElement, type: string) { element.dispatchEvent( new PointerEvent(type, { diff --git a/ui/src/formkit/AiModelSelector.vue b/ui/src/formkit/AiModelSelector.vue index 91650ac7..c400f4fb 100644 --- a/ui/src/formkit/AiModelSelector.vue +++ b/ui/src/formkit/AiModelSelector.vue @@ -23,6 +23,7 @@ import { computed, nextTick, shallowRef, useId, useTemplateRef, watch } from 'vu import { RouterLink } from 'vue-router' import MingcuteCloseLine from '~icons/mingcute/close-line' import MingcuteDownLine from '~icons/mingcute/down-line' +import MingcuteGrid2Line from '~icons/mingcute/grid-2-line' import MingcuteSearchLine from '~icons/mingcute/search-line' import MingcuteSettings3Line from '~icons/mingcute/settings-3-line' import RiBrainLine from '~icons/ri/brain-line' @@ -79,8 +80,10 @@ const emit = defineEmits<{ const triggerId = useId() const helpId = `${triggerId}-help` const searchInputRef = useTemplateRef('searchInput') +const providerRailRef = useTemplateRef('providerRail') const keyword = shallowRef('') const isOpen = shallowRef(false) +const providerFilter = shallowRef('all') const selectedModelSnapshot = shallowRef() const modelType = computed(() => props.modelType) @@ -113,8 +116,15 @@ const { results: fuseResults } = useFuse( }, ) +const providerGroups = computed(() => { + return groupModelOptionsByProvider(modelOptions.value) +}) const groups = computed(() => { - return groupModelOptionsByProvider(fuseResults.value.map((result) => result.item)) + const keywordGroups = groupModelOptionsByProvider(fuseResults.value.map((result) => result.item)) + if (providerFilter.value === 'all') { + return keywordGroups + } + return keywordGroups.filter((group) => group.key === providerFilter.value) }) const selectedValue = computed(() => props.modelValue || undefined) const selectedModel = computed(() => { @@ -163,6 +173,16 @@ watch(selectedValue, (value) => { watch(isOpen, (open) => { if (!open) { keyword.value = '' + providerFilter.value = 'all' + } +}) + +watch(providerGroups, (groups) => { + if ( + providerFilter.value !== 'all' && + !groups.some((group) => group.key === providerFilter.value) + ) { + providerFilter.value = 'all' } }) @@ -214,6 +234,53 @@ function clearSelection() { emit('update:modelValue', undefined) } +function selectProviderFilter(key: string) { + providerFilter.value = key + searchInputRef.value?.focus({ preventScroll: true }) +} + +function providerRailButtons() { + return Array.from(providerRailRef.value?.querySelectorAll('button') ?? []) +} + +function focusProviderRailButton(index: number) { + const buttons = providerRailButtons() + if (!buttons.length) { + return + } + buttons[(index + buttons.length) % buttons.length]?.focus() +} + +function handleProviderRailKeydown(event: KeyboardEvent, index: number) { + event.stopPropagation() + switch (event.key) { + case 'ArrowDown': + event.preventDefault() + focusProviderRailButton(index + 1) + break + case 'ArrowUp': + event.preventDefault() + focusProviderRailButton(index - 1) + break + case 'Home': + event.preventDefault() + focusProviderRailButton(0) + break + case 'End': + event.preventDefault() + focusProviderRailButton(providerRailButtons().length - 1) + break + case 'Tab': + event.preventDefault() + searchInputRef.value?.focus({ preventScroll: true }) + break + case 'Escape': + event.preventDefault() + isOpen.value = false + break + } +} + async function focusModelFromSearch(delta: -1 | 1) { const models = selectableModels.value if (!models.length) { @@ -271,6 +338,11 @@ function handleSearchKeydown(event: KeyboardEvent) { isOpen.value = false break case 'Tab': + if (providerGroups.value.length) { + event.preventDefault() + event.stopPropagation() + focusProviderRailButton(event.shiftKey ? -1 : 0) + } break default: event.stopPropagation() @@ -356,7 +428,7 @@ function handleSearchKeydown(event: KeyboardEvent) { :disable-outside-pointer-events="false" class=":uno: ai-model-selector__content" :style="{ - width: 'min(var(--reka-select-trigger-width), 32rem)', + width: 'min(max(var(--reka-select-trigger-width), 30rem), 32rem, calc(100vw - 1rem))', maxHeight: 'min(26rem, var(--reka-select-content-available-height))', }" > @@ -389,57 +461,121 @@ function handleSearchKeydown(event: KeyboardEvent) { -
+
{{ emptyText }}
- + + + + + +
+
From dd0e5389da1a4ce6af9db8357eee79a0cbb76ab3 Mon Sep 17 00:00:00 2001 From: Ryan Wang Date: Fri, 13 Nov 2026 14:29:12 +0800 Subject: [PATCH 2/2] Fix model selector scrolling after provider switch Re-key the select content when the provider filter changes so Reka re-registers the selected item used by its scroll buttons, and focus the search input after the remount. Use null as the all-providers sentinel so a provider named all can be filtered independently. --- ui/src/formkit/AiModelSelector.test.ts | 46 ++++++++++++++++++++++++++ ui/src/formkit/AiModelSelector.vue | 38 ++++++++++++--------- 2 files changed, 68 insertions(+), 16 deletions(-) diff --git a/ui/src/formkit/AiModelSelector.test.ts b/ui/src/formkit/AiModelSelector.test.ts index 882db69b..e42c1187 100644 --- a/ui/src/formkit/AiModelSelector.test.ts +++ b/ui/src/formkit/AiModelSelector.test.ts @@ -158,6 +158,52 @@ describe('AiModelSelector', () => { ) }) + it('remounts the list content and returns focus to search after switching providers', async () => { + const wrapper = mountSelector({ searchPlaceholder: '搜索模型...' }) + + await openSelector(wrapper) + const previousInput = getSearchInput() + previousInput.focus() + + await clickProviderFilter('DeepSeek (深度求索 DeepSeek)') + + expect(getSearchInput()).not.toBe(previousInput) + await vi.waitFor(() => { + expect(document.activeElement).toBe(getSearchInput()) + }) + }) + + it('filters a provider named all independently from the all button', async () => { + modelOptions.value = [ + modelOption({ + name: 'all-named-model', + displayName: 'All Named Model', + modelId: 'all-named-model', + providerName: 'all', + providerDisplayName: 'All Named', + providerTypeDisplayName: 'OpenAI', + }), + modelOption({ + name: 'other-model', + displayName: 'Other Model', + modelId: 'other-model', + providerName: 'other', + providerDisplayName: 'Other Provider', + providerTypeDisplayName: 'OpenAI', + }), + ] + const wrapper = mountSelector({ searchPlaceholder: '搜索模型...' }) + + await openSelector(wrapper) + await clickProviderFilter('All Named (OpenAI)') + + expect(getOptions().map((option) => option.textContent)).toEqual([ + expect.stringContaining('All Named Model'), + ]) + expect(getProviderButton('All Named (OpenAI)')?.getAttribute('aria-pressed')).toBe('true') + expect(getProviderButton('全部供应商')?.getAttribute('aria-pressed')).toBe('false') + }) + it('renders unavailable models without allowing selection', async () => { const wrapper = mountSelector() diff --git a/ui/src/formkit/AiModelSelector.vue b/ui/src/formkit/AiModelSelector.vue index c400f4fb..f855fed8 100644 --- a/ui/src/formkit/AiModelSelector.vue +++ b/ui/src/formkit/AiModelSelector.vue @@ -83,7 +83,7 @@ const searchInputRef = useTemplateRef('searchInput') const providerRailRef = useTemplateRef('providerRail') const keyword = shallowRef('') const isOpen = shallowRef(false) -const providerFilter = shallowRef('all') +const providerFilter = shallowRef(null) const selectedModelSnapshot = shallowRef() const modelType = computed(() => props.modelType) @@ -121,7 +121,7 @@ const providerGroups = computed(() => { }) const groups = computed(() => { const keywordGroups = groupModelOptionsByProvider(fuseResults.value.map((result) => result.item)) - if (providerFilter.value === 'all') { + if (providerFilter.value === null) { return keywordGroups } return keywordGroups.filter((group) => group.key === providerFilter.value) @@ -173,16 +173,16 @@ watch(selectedValue, (value) => { watch(isOpen, (open) => { if (!open) { keyword.value = '' - providerFilter.value = 'all' + providerFilter.value = null } }) watch(providerGroups, (groups) => { if ( - providerFilter.value !== 'all' && + providerFilter.value !== null && !groups.some((group) => group.key === providerFilter.value) ) { - providerFilter.value = 'all' + providerFilter.value = null } }) @@ -195,12 +195,7 @@ watch( }, ) -function handleOpenChange(open: boolean) { - isOpen.value = open - if (!open) { - return - } - +function focusSearchInput() { nextTick(() => { window.requestAnimationFrame(() => { if (isOpen.value) { @@ -210,6 +205,15 @@ function handleOpenChange(open: boolean) { }) } +function handleOpenChange(open: boolean) { + isOpen.value = open + if (!open) { + return + } + + focusSearchInput() +} + function handleValueChange(value: unknown) { if (typeof value === 'string') { emit('update:modelValue', value || undefined) @@ -234,9 +238,9 @@ function clearSelection() { emit('update:modelValue', undefined) } -function selectProviderFilter(key: string) { +function selectProviderFilter(key: string | null) { providerFilter.value = key - searchInputRef.value?.focus({ preventScroll: true }) + focusSearchInput() } function providerRailButtons() { @@ -419,7 +423,9 @@ function handleSearchKeydown(event: KeyboardEvent) {
+