Skip to content

Fix search dropdown behaviour #1512

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

Merged
st0012 merged 2 commits into from
Dec 22, 2025
+27 −16
Merged

Fix search dropdown behaviour #1512

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
67aca7f
Fix search dropdown behaviour
st0012 Dec 19, 2025
d461adf
Bump RDoc version to 7.0.2
st0012 Dec 19, 2025
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
32 changes: 17 additions & 15 deletions lib/rdoc/generator/template/aliki/js/aliki.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,15 +67,7 @@ function createSearchInstance(input, result) {
}

search.select = function(result) {
let href = result.firstChild.firstChild.href;
const query = this.input.value;
if (query) {
const url = new URL(href, window.location.origin);
url.searchParams.set('q', query);
url.searchParams.set('nav', '0');
href = url.toString();
}
window.location.href = href;
window.location.href = result.firstChild.firstChild.href;
}

search.scrollIntoView = search.scrollInWindow;
Expand All @@ -97,15 +89,27 @@ function hookSearch() {
const search = createSearchInstance(input, result);
if (!search) return;

// Hide search results when clicking outside the search area
document.addEventListener('click', (e) => {
if (!e.target.closest('.navbar-search-desktop')) {
search.hide();
}
});

// Show search results when focusing on input (if there's a query)
input.addEventListener('focus', () => {
if (input.value.trim()) {
search.show();
}
});

// Check for ?q= URL parameter and trigger search automatically
if (typeof URLSearchParams !== 'undefined') {
const urlParams = new URLSearchParams(window.location.search);
const queryParam = urlParams.get('q');
if (queryParam) {
const navParam = urlParams.get('nav');
const autoSelect = navParam !== '0';
input.value = queryParam;
search.search(queryParam, autoSelect);
search.search(queryParam, false);
}
}
}
Expand Down Expand Up @@ -378,9 +382,7 @@ function hookSearchModal() {
if (queryParam && isSmallViewport) {
openSearchModal();
searchInput.value = queryParam;
const navParam = urlParams.get('nav');
const autoSelect = navParam !== '0';
mobileSearch.search(queryParam, autoSelect);
mobileSearch.search(queryParam, false);
}
}
}
Expand Down
9 changes: 9 additions & 0 deletions lib/rdoc/generator/template/aliki/js/search_controller.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,5 +116,14 @@ SearchController.prototype = Object.assign({}, SearchNavigation, new function()
});
}

this.hide = function() {
this.result.setAttribute('aria-expanded', 'false');
this.setNavigationActive(false);
}

this.show = function() {
this.result.setAttribute('aria-expanded', 'true');
this.setNavigationActive(true);
}
});

2 changes: 1 addition & 1 deletion lib/rdoc/version.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ module RDoc
##
# RDoc version you are using

VERSION = '7.0.1'
VERSION = '7.0.2'
Copy link
Member

@tompng tompng Dec 21, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe wrong commit pushed?
I'm fine cutting 7.0.2

Copy link
Member Author

@st0012 st0012 Dec 21, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No I just thought if we could merge the PR we can ship it immediately in 7.0.2 😛
This would still work tho. I'd love to cut a new release right after this is merged.

Copy link
Member

@tompng tompng Dec 22, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I see 👍


end