Skip to content

fix(searchbox): fix loadingIndicator and reset templates #3313

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
francoischalifour merged 1 commit into from
Nov 28, 2018
Merged

fix(searchbox): fix loadingIndicator and reset templates #3313

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 9 additions & 4 deletions src/widgets/search-box/__tests__/search-box-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,15 +79,20 @@ describe('searchBox()', () => {
root: ['root', 'customRoot'],
form: 'form',
input: 'input',
submit: 'submit',
reset: 'reset',
resetIcon: 'resetIcon',
loadingIndicator: 'loadingIndicator',
loadingIcon: 'loadingIcon',
submit: 'submit',
};

widget = searchBox(opts);
widget.init({ state, helper, onHistoryChange });
widget.render({
state,
helper,
searchMetadata: { isSearchStalled: false },
});

expect(container.querySelector('.ais-SearchBox').classList).toContain(
'root'
Expand All @@ -101,15 +106,15 @@ describe('searchBox()', () => {
expect(
container.querySelector('.ais-SearchBox-input').classList
).toContain('input');
expect(
container.querySelector('.ais-SearchBox-submit').classList
).toContain('submit');
expect(
container.querySelector('.ais-SearchBox-reset').classList
).toContain('reset');
expect(
container.querySelector('.ais-SearchBox-resetIcon').classList
).toContain('resetIcon');
expect(
container.querySelector('.ais-SearchBox-submit').classList
).toContain('submit');
expect(
container.querySelector('.ais-SearchBox-loadingIndicator').classList
).toContain('loadingIndicator');
Expand Down
28 changes: 17 additions & 11 deletions src/widgets/search-box/search-box.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,21 +97,26 @@ const renderer = ({
`.${cssClasses.loadingIndicator}`
);

if (isSearchStalled) {
loadingIndicatorElement.removeAttribute('hidden');
} else {
loadingIndicatorElement.setAttribute('hidden', '');
if (loadingIndicatorElement) {
if (isSearchStalled) {
loadingIndicatorElement.removeAttribute('hidden');
} else {
loadingIndicatorElement.setAttribute('hidden', '');
}
}
}

if (showReset) {
const resetElement = containerNode.querySelector(`.${cssClasses.reset}`);
const isUserTyping = Boolean(query && query.trim());

if (isUserTyping && !isSearchStalled) {
resetElement.removeAttribute('hidden');
} else {
resetElement.setAttribute('hidden', '');
if (resetElement) {
const isUserTyping = Boolean(query && query.trim());

if (isUserTyping && !isSearchStalled) {
resetElement.removeAttribute('hidden');
} else {
resetElement.setAttribute('hidden', '');
}
}
}
};
Expand All @@ -126,7 +131,7 @@ const usage = `Usage:
searchBox({
container,
[ placeholder ],
[ cssClasses.{root, input, reset, submit, loadingIndicator} ],
[ cssClasses.{root, form, input, submit, submitIcon, reset, resetIcon, loadingIndicator, loadingIcon} ],
[ autofocus = false ],
[ searchAsYouType = true ],
[ showReset = true ],
Expand All @@ -148,11 +153,12 @@ searchBox({
* @property {string|string[]} [root] CSS class to add to the wrapping `<div>`
* @property {string|string[]} [form] CSS class to add to the form
* @property {string|string[]} [input] CSS class to add to the input.
* @property {string|string[]} [submit] CSS classes added to the submit button.
* @property {string|string[]} [submitIcon] CSS classes added to the submit icon.
* @property {string|string[]} [reset] CSS classes added to the reset button.
* @property {string|string[]} [resetIcon] CSS classes added to the reset icon.
* @property {string|string[]} [loadingIndicator] CSS classes added to the loading indicator element.
* @property {string|string[]} [loadingIcon] CSS classes added to the loading indicator icon.
* @property {string|string[]} [submit] CSS classes added to the submit.
*/

/**
Expand Down