Skip to content
This repository was archived by the owner on Mar 13, 2025. It is now read-only.

issue 102 fix #560

Merged
merged 2 commits into from
Jul 24, 2020
Merged
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
11 changes: 11 additions & 0 deletions client/src/pages/Search/Global.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -50,13 +50,16 @@ export default function SearchGlobal({ keyword }) {
const [windowWidth, setWindowWidth] = React.useState(window.innerWidth);
const [orderBy, setOrderBy] = React.useState(config.DEFAULT_SORT_ORDER);
const [totalPages, setTotalPages] = React.useState(0);
const dropdownRef = React.useRef(null);

const usersPerPage = config.ITEMS_PER_PAGE;

React.useEffect(() => {
window.addEventListener("resize", updateWindowDimensions);
window.addEventListener("click", onWholeContentClick);
return () => {
window.removeEventListener("resize", updateWindowDimensions);
window.removeEventListener("click", onWholeContentClick);
};
});

Expand Down Expand Up @@ -222,6 +225,7 @@ export default function SearchGlobal({ keyword }) {
});

setUsers(data);
setSortByDropdownShown(false);
setTotalResults(Number(headers["x-total"]));
setTotalPages(Number(headers["x-total-pages"]));
}
Expand All @@ -240,6 +244,12 @@ export default function SearchGlobal({ keyword }) {
const updateWindowDimensions = () => {
setWindowWidth(window.innerWidth);
};

const onWholeContentClick = (evt) => {
if(dropdownRef.current && !dropdownRef.current.contains(evt.target)) {
setSortByDropdownShown(false);
}
}

return (
<>
Expand All @@ -258,6 +268,7 @@ export default function SearchGlobal({ keyword }) {
</div>
<div
className={style.sort}
ref={dropdownRef}
onClick={() => setSortByDropdownShown(!sortByDropdownShown)}
style={{
marginRight:
Expand Down