Skip to content

IW-1977 | properly bind click handler for search suggestions #128

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
merged 10 commits into from
Sep 10, 2019
Merged

IW-1977 | properly bind click handler for search suggestions #128

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
7771ade
IW-1977: properly bind click handler for search suggestions
rybmat Sep 6, 2019
bd644ba
IW-1977: return false from search suggestion click handler
rybmat Sep 9, 2019
0cfbbdb
IW-1977: event.preventDefault on suggestion click
rybmat Sep 9, 2019
5b8a7c5
9.14.6-search-fix-3
rybmat Sep 9, 2019
360da3f
IW-1997: check if event is not undefined before invoking method on it
rybmat Sep 9, 2019
fef29ef
IW-1977: improve test
rybmat Sep 9, 2019
20f9058
IW-1997: code formatting
rybmat Sep 9, 2019
cc7b951
9.14.6
rybmat Sep 10, 2019
d88ac9c
9.14.8
rybmat Sep 10, 2019
c520a42
9.14.9
rybmat Sep 10, 2019
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
2 changes: 1 addition & 1 deletion docs/build/bundle.99be1485.js → docs/build/bundle.4744580e.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion docs/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<!DOCTYPE html><html><head><meta charset="UTF-8"><meta name="viewport" content="width=device-width, initial-scale=1.0"><meta http-equiv="X-UA-Compatible" content="ie=edge"><title>react-common</title><link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Rubik:300,300i,400,400i,500,500i,700,700i,900,900i&display=swap"></head><body><div id="rsg-root"></div><div id="app"></div><script src="build/bundle.99be1485.js"></script></body></html>
<!DOCTYPE html><html><head><meta charset="UTF-8"><meta name="viewport" content="width=device-width, initial-scale=1.0"><meta http-equiv="X-UA-Compatible" content="ie=edge"><title>react-common</title><link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Rubik:300,300i,400,400i,500,500i,700,700i,900,900i&display=swap"></head><body><div id="rsg-root"></div><div id="app"></div><script src="build/bundle.4744580e.js"></script></body></html>
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@wikia/react-common",
"version": "9.14.6",
"version": "9.14.9",
"description": "Wikia's reusable React parts",
"repository": "git@github.com:Wikia/react-common.git",
"license": "UNLICENSED",
Expand Down
9 changes: 6 additions & 3 deletions source/components/GlobalNavigation/components/Search/Search.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ class Search extends React.Component {
this.onBlur = this.onBlur.bind(this);
this.onFocus = this.onFocus.bind(this);
this.onKeyDown = this.onKeyDown.bind(this);
this.onSearchSuggestionClick = this.onSearchSuggestionClick.bind(this);
this.requestSuggestionsFromAPI = debounce(this.requestSuggestionsFromAPI.bind(this), DEBOUNCE_DURATION);
}

Expand Down Expand Up @@ -116,7 +115,7 @@ class Search extends React.Component {
}
}

onSearchSuggestionClick(index) {
onSearchSuggestionClick(index, event) {
const { track, onSearchSuggestionChosen } = this.props;
const { suggestions, suggestionId } = this.state;

Expand All @@ -129,6 +128,10 @@ class Search extends React.Component {
category: 'navigation',
label: 'search-open-suggestion-link',
});

if (event) {
event.preventDefault();
}
}

onSearchActivation() {
Expand Down Expand Up @@ -367,7 +370,7 @@ class Search extends React.Component {
<li
key={suggestion}
className={wrapperClassName}
onClick={this.onSearchSuggestionClick}
onClick={this.onSearchSuggestionClick.bind(this, index)}
onMouseEnter={this.onSuggestionHover.bind(this, index)}
>
<a
Expand Down
11 changes: 11 additions & 0 deletions source/components/GlobalNavigation/components/Search/Search.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,6 +278,9 @@ describe('onSearchSuggestionClick', () => {
track: trackMock,
}).setState(stateMock);
const instance = wrapper.instance();
const event = {
preventDefault: jest.fn(),
};

instance.onSearchClose = onSearchCloseMock;

Expand All @@ -286,6 +289,14 @@ describe('onSearchSuggestionClick', () => {
expect(onSearchSuggestionChosenMock).toBeCalledWith(suggestionsMock[1], suggestionsMock, suggestionIdMock);
expect(onSearchCloseMock).toBeCalledWith();
expect(trackMock).toBeCalledWith(expect.any(Object));
expect(event.preventDefault).not.toBeCalled();

instance.onSearchSuggestionClick(1, event);

expect(onSearchSuggestionChosenMock).toBeCalledWith(suggestionsMock[1], suggestionsMock, suggestionIdMock);
expect(onSearchCloseMock).toBeCalledWith();
expect(trackMock).toBeCalledWith(expect.any(Object));
expect(event.preventDefault).toBeCalled();
});
});

Expand Down