diff --git a/src/lib/components/chat/ModelSelector/Selector.svelte b/src/lib/components/chat/ModelSelector/Selector.svelte index 8d7e54ae73..428d128ba8 100644 --- a/src/lib/components/chat/ModelSelector/Selector.svelte +++ b/src/lib/components/chat/ModelSelector/Selector.svelte @@ -966,7 +966,9 @@ aria-autocomplete="list" aria-expanded={filteredItems.length + downloadTargets.length > 0} aria-controls="model-selector-list" - aria-activedescendant={filteredItems.length + downloadTargets.length > 0 + aria-activedescendant={filteredItems.length + downloadTargets.length > 0 && + (selectedModelIdx >= filteredItems.length || + (selectedModelIdx >= visibleStart && selectedModelIdx < visibleEnd)) ? `model-option-${selectedModelIdx}` : undefined} on:keydown={(e) => { @@ -994,6 +996,18 @@ selectedModelIdx = 0; } + if ( + listContainer && + selectedModelIdx < filteredItems.length && + (selectedModelIdx < visibleStart || selectedModelIdx >= visibleEnd) + ) { + listScrollTop = Math.max( + 0, + selectedModelIdx * ITEM_HEIGHT - 128 + ITEM_HEIGHT / 2 + ); + listContainer.scrollTop = listScrollTop; + } + const item = document.querySelector(`[data-arrow-selected="true"]`); item?.scrollIntoView({ block: 'center',