Skip to content

Commit

Permalink
fix a11y search
Browse files Browse the repository at this point in the history
  • Loading branch information
giuliaghisini committed Jul 20, 2022
1 parent 3f2a183 commit e8fc129
Show file tree
Hide file tree
Showing 5 changed files with 46 additions and 3 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@

### Bugfix

- fix a11y search. @giuliaghisini

### Internal

### Documentation
Expand Down Expand Up @@ -165,6 +167,7 @@
- Fix RenderBlocks: path @ksuess
- Fix field id creation in dexterity control panel to have slugified id @erral
- Changed to get intl.locale always from state @ionlizarazu

### Feature

- Updated Brazilian Portuguese translation @ericof
Expand Down
25 changes: 24 additions & 1 deletion src/components/theme/Search/Search.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ class Search extends Component {
componentDidMount() {
this.doSearch();
this.setState({ isClient: true });
this.focusResults();
}

/**
Expand All @@ -87,6 +88,22 @@ class Search extends Component {
if (this.props.location.search !== nextProps.location.search) {
this.doSearch();
}

if (
JSON.stringify(this.props.search) !== JSON.stringify(nextProps.search)
) {
//all'apertura della pagina dei risultati di ricerca, sposto il focus sui risultati
this.focusResults();
}
};

focusResults = () => {
//all'apertura della pagina dei risultati di ricerca, sposto il focus sui risultati
setTimeout(function () {
if (document.querySelector('#page-search #search-results')) {
document.querySelector('#page-search #search-results').focus();
}
}, 100);
};

/**
Expand Down Expand Up @@ -146,7 +163,13 @@ class Search extends Component {
return (
<Container id="page-search">
<Helmet title="Search" />
<div className="container">
<div
className="container"
role="region"
aria-live="polite"
id="search-results"
tabIndex={-1}
>
<article id="content">
<header>
<h1 className="documentFirstHeading">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,11 @@ exports[`Search renders a search component 1`] = `
id="page-search"
>
<div
aria-live="polite"
className="container"
id="search-results"
role="region"
tabIndex={-1}
>
<article
id="content"
Expand Down Expand Up @@ -87,7 +91,11 @@ exports[`Search renders an empty search component 1`] = `
id="page-search"
>
<div
aria-live="polite"
className="container"
id="search-results"
role="region"
tabIndex={-1}
>
<article
id="content"
Expand Down
11 changes: 9 additions & 2 deletions src/components/theme/SearchWidget/SearchWidget.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,11 @@ class SearchWidget extends Component {
*/
render() {
return (
<Form action="/search" onSubmit={this.onSubmit}>
<Form
action="/search"
onSubmit={this.onSubmit}
aria-controls="search-results"
>
<Form.Field className="searchbox">
<Input
aria-label={this.props.intl.formatMessage(messages.search)}
Expand All @@ -103,7 +107,10 @@ class SearchWidget extends Component {
placeholder={this.props.intl.formatMessage(messages.searchSite)}
title={this.props.intl.formatMessage(messages.search)}
/>
<button aria-label={this.props.intl.formatMessage(messages.search)}>
<button
aria-label={this.props.intl.formatMessage(messages.search)}
aria-controls="search-results"
>
<Icon name={zoomSVG} size="18px" />
</button>
</Form.Field>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
exports[`SearchWidget renders a search widget component 1`] = `
<form
action="/search"
aria-controls="search-results"
className="ui form"
onSubmit={[Function]}
>
Expand All @@ -24,6 +25,7 @@ exports[`SearchWidget renders a search widget component 1`] = `
/>
</div>
<button
aria-controls="search-results"
aria-label="Search"
>
<svg
Expand Down

0 comments on commit e8fc129

Please sign in to comment.