Skip to content

Commit d748b21

Browse files
authored
vdoc: optimize generated pages (#19185)
1 parent 01cb30c commit d748b21

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

cmd/tools/vdoc/theme/doc.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,7 @@ body {
280280
}
281281
.doc-nav > .content > ul > li > ul > li.active {
282282
border-color: #00000066;
283-
border-color: var(--menu-search-result-hover-background-color);
283+
border-color: var(--menu-indent-line-active-color);
284284
}
285285
.doc-nav > .content a {
286286
color: #fff;

cmd/tools/vdoc/theme/doc.js

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@
1111

1212
function setupScrollSpy() {
1313
const mainContent = document.querySelector('#main-content');
14-
// Ensure initial keyboard navigability
15-
mainContent.focus();
1614
const toc = mainContent.querySelector('.doc-toc');
1715
const sections = mainContent.querySelectorAll('section');
1816
const sectionPositions = Array.from(sections).map((section) => section.offsetTop);
@@ -168,6 +166,7 @@ function setupSearch() {
168166

169167
function setupSearchKeymaps() {
170168
const searchInput = document.querySelector('#search input');
169+
const mainContent = document.querySelector('#main-content');
171170
// Keyboard shortcut indicator
172171
const searchKeys = document.createElement('div');
173172
const modifierKeyPrefix = navigator.platform.includes('Mac') ? '⌘' : 'Ctrl';
@@ -190,14 +189,15 @@ function setupSearchKeymaps() {
190189
results[selectedIdx].classList.remove('selected');
191190
}
192191
results[newIdx].classList.add('selected');
193-
results[newIdx].scrollIntoView({ behavior: 'smooth', block: 'end', inline: 'nearest' });
192+
results[newIdx].scrollIntoView({ behavior: 'instant', block: 'nearest', inline: 'nearest' });
194193
selectedIdx = newIdx;
195194
}
196195
searchInput.addEventListener('keydown', (ev) => {
197196
const searchResults = document.querySelectorAll('.search .result');
198197
switch (ev.key) {
199198
case 'Escape':
200199
searchInput.blur();
200+
mainContent.focus();
201201
break;
202202
case 'Enter':
203203
if (!searchResults.length || selectedIdx === -1) break;
@@ -229,6 +229,8 @@ function setupSearchKeymaps() {
229229
selectedIdx = -1;
230230
}
231231
});
232+
// Ensure initial keyboard navigability
233+
mainContent.focus();
232234
}
233235

234236
function createSearchResult(data) {

0 commit comments

Comments
 (0)