Skip to content

Implement Search as ARIA spec compliant* dialog and combobox pattern #2831

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.

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
merged 5 commits into from
Feb 22, 2025
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
15 changes: 15 additions & 0 deletions src/lib/output/themes/default/assets/typedoc/components/Filter.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,19 @@ import { storage } from "../utils/storage.js";
const style = document.head.appendChild(document.createElement("style"));
style.dataset.for = "filters";

/** Filter classes, true if they will currently show, false otherwise */
const filters: Record<string, boolean> = {};

export function classListWillBeFiltered(classList: string): boolean {
for (const className of classList.split(/\s+/)) {
// There might be other classes in the list besides just what we filter on
if (filters.hasOwnProperty(className) && !filters[className]) {
return true;
}
}
return false;
}

/**
* Handles sidebar filtering functionality.
*/
Expand Down Expand Up @@ -57,6 +70,8 @@ export class Filter extends Component<HTMLInputElement> {
this.el.checked = this.value;
document.documentElement.classList.toggle(this.key, this.value);

filters[`tsd-is-${this.el.name}`] = this.value;

this.app.filterChanged();
this.app.updateIndexVisibility();
}
Expand Down
16 changes: 14 additions & 2 deletions src/lib/output/themes/default/assets/typedoc/components/Search.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import { debounce } from "../utils/debounce.js";
import { Index } from "lunr";
import { decompressJson } from "../utils/decompress.js";
import { openModal, setUpModal } from "../utils/modal.js";
import { classListWillBeFiltered } from "./Filter.js";

/**
* Keep this in sync with the interface in src/lib/output/plugins/JavascriptIndexPlugin.ts
Expand Down Expand Up @@ -205,7 +206,14 @@ function updateResults(
return x.length ? `*${x}*` : "";
})
.join(" ");
res = state.index.search(searchWithWildcards);

res = state.index
.search(searchWithWildcards)
// filter out active *filters* manually, since lunr doesn't support it.
.filter(({ ref }) => {
const classes = state.data!.rows[Number(ref)].classes;
return !classes || !classListWillBeFiltered(classes);
});
} else {
// Set empty `res` to prevent getting random results with wildcard search
// when the `searchText` is empty.
Expand Down Expand Up @@ -239,8 +247,12 @@ function updateResults(
const c = Math.min(10, res.length);
for (let i = 0; i < c; i++) {
const row = state.data.rows[Number(res[i].ref)];
const label = window.translations[`kind_${row.kind}`].replaceAll(
'"',
"&quot;",
);
const icon =
`<svg width="20" height="20" viewBox="0 0 24 24" fill="none" class="tsd-kind-icon"><use href="#icon-${row.kind}"></use></svg>`;
`<svg width="20" height="20" viewBox="0 0 24 24" fill="none" class="tsd-kind-icon" aria-label="${label}"><use href="#icon-${row.kind}"></use></svg>`;

// Highlight the matched part of the query in the search results
let name = highlightMatches(row.name, searchText);
Expand Down
Loading